diff --git a/.docker-compose.gv.env b/.docker-compose.gv.env
index 9d5583b0eb3..e2f51606213 100644
--- a/.docker-compose.gv.env
+++ b/.docker-compose.gv.env
@@ -12,6 +12,6 @@ OSF_AUTH_COOKIE_NAME=osf
 SESSION_COOKIE_SECURE=false
 SESSION_COOKIE_HTTPONLY=true
 SESSION_COOKIE_SAMESITE=Lax
-OSF_SENSITIVE_DATA_SECRET="TrainglesAre5Squares"
+OSF_SENSITIVE_DATA_SECRET="TrianglesAre5Squares"
 OSF_SENSITIVE_DATA_SALT="yusaltydough"
 DEBUG=1
diff --git a/CHANGELOG b/CHANGELOG
index b36abb82195..8582ff6b608 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -88,14 +88,14 @@ We follow the CalVer (https://calver.org/) versioning scheme: YY.MINOR.MICRO.
 
 - Crossref DOIs not minting with _v1, OSF is displaying DOI versions with _v1
 - When hamming a spammed user, preprints and registrations remain private
-- Fix emabrgoed registrations not becoming public after admin date change
-- Add v2 enpoint for alternative email confirmation
+- Fix embargoed registrations not becoming public after admin date change
+- Add v2 endpoint for alternative email confirmation
 - Make relationship on v2/nodes for collected_in
 - API V2: get action reviews request not listing latest preprint submit/withdraw requests
 - Add ability for admin app to change registry that a registration belongs to
 - Update to /nodes/<node-id> api
 - Subscription filtering not working correctly
-- API V2: Serialize registation resource attributes in Node Linked By Registrations list view and Node Linked Registrations list view
+- API V2: Serialize registration resource attributes in Node Linked By Registrations list view and Node Linked Registrations list view
 
 25.10.0 (2025-06-11)
 ====================
@@ -159,7 +159,7 @@ We follow the CalVer (https://calver.org/) versioning scheme: YY.MINOR.MICRO.
 24.10.0 (2024-12-05)
 ====================
 
-- Migrate Preprint Affilations
+- Migrate Preprint Affiliations
 - Add OOPSpam and Akismet metrics to spam report
 - Add PrivateSpamMetricsReport
 - Update PrivateSpamMetricsReporter to work with refactored MonthlyReporter
@@ -340,7 +340,7 @@ reasons
 
 22.11.0 (2022-11-21)
 ====================
-- Enable monitoring and moderation of OSF resoruces based on links to external
+- Enable monitoring and moderation of OSF resources based on links to external
 domains
 
 22.10.0 (2022-10-25)
@@ -448,12 +448,12 @@ domains
 
 21.08.0 (2021-11-30)
 ====================
-- Remaining work in support of Registrion Versioning/Updating
+- Remaining work in support of Registration Versioning/Updating
 
 21.07.0 (2021-10-04)
 ====================
 - Add support for Registry Admins to bulk upload
-- Add models suppoorting Registration Versioning
+- Add models supporting Registration Versioning
 - Normalize default institutional affiliation for drafts
 - Fix bugs with spam training
 
@@ -687,7 +687,7 @@ domains
 ===================
 - Automatically map subjects when a preprint is moved to a different
   preprint provider in the admin app
-- Gitlab: return all repos to which the user has access
+- GitLab: return all repos to which the user has access
 - Upgrade Bower
 - Py3 backwards compatible changes
 
@@ -1033,7 +1033,7 @@ tags, using a m2m field.
 ====================
 
 - APIv2: Add Node Settings endpoint.
-- APIv2: Add employers and eductional_institutions to user serializer.
+- APIv2: Add employers and educational_institutions to user serializer.
 - APIv2: Add endpoints for account export and deactivation requests.
 - APIv2: Retrieve/delete user external identities.
 - Move addon max file size limits to settings files.
@@ -1159,10 +1159,10 @@ for GitHub, Zotero, and Mendeley addons.
 - Upgrade Dropbox client version.
 - Add field to PreprintProvider to toggle Hypothesis commenting.
 - Fix using django-waffle with groups.
-- Fix bug that caused project to be unreachable if it had a deleted BitBucket addon.
+- Fix bug that caused project to be unreachable if it had a deleted Bitbucket addon.
 - Fix incorrect OSF Meeting instructions.
 - Remove unused fonts and styles from landing page.
-- Hide hierarchy on search results if parent is priate.
+- Hide hierarchy on search results if parent is private.
 - API: Fix /data/relationships/referent/type for /guids/<registration-id>/?resolve=false endpoint.
 - API: Optimize node delete endpoint.
 - Admin: Fix typos.
@@ -1198,7 +1198,7 @@ Deprecates NodeWikiVersion, Node.wiki_pages_versions, and Node.wiki_pages_curren
 
 - Display file metadata for addon files deleted outside of the OSF.
 - Add decorator for feature-flagging EmbOSF routes.
-- Add footer to OSF landing page foor logged out users.
+- Add footer to OSF landing page for logged out users.
 - Make loading indicators consistent.
 - Show DOIs on withdrawn registrations.
 - Make support email configurable in settings.
@@ -1300,7 +1300,7 @@ Deprecates NodeWikiVersion, Node.wiki_pages_versions, and Node.wiki_pages_curren
 - Subsequent files do not receive a modal when copied over to a folder
 - Unable to authorize figshare accounts with unicode in name
 - fix incorrect method name in oauth node config js
-- In Fangorn, Github's [Open] button only points to the default branch
+- In Fangorn, GitHub's [Open] button only points to the default branch
 - Popular Public and New & Noteworthy -- making a project private causes error
 - Admin app: accessing list of user's permissions 502s
 - Unable to mark node as Ham
@@ -1316,7 +1316,7 @@ Deprecates NodeWikiVersion, Node.wiki_pages_versions, and Node.wiki_pages_curren
 - Citations preview should show the full name field if the individual name sections are blank
 - Incorrect error message is shown for Dataverse 500 error
 - File checked out to Alex DeHaven after Prereg Challenge submission is approved.
-- Don't use {} as a attribute default value
+- Don't use {} as an attribute default value
 - [admin app] Searching for user names that contain periods or commas returns 502
 - Forks total includes registrations
 - Fix spelling for new VOL section in project settings
@@ -1491,7 +1491,7 @@ Deprecates NodeWikiVersion, Node.wiki_pages_versions, and Node.wiki_pages_curren
 - Make ever_mentioned a ManyToMany field
 - Remove unused mongo code in framework.mongo
 - Reduce number of queries made by triggered mails script
-- Add a context manager to prevent auto_now fields from from getting updated during migrations
+- Add a context manager to prevent auto_now fields from getting updated during migrations
 - Remove model name aliasing in imports
 - Remove dead badges code
 - Add view OSF Subjects Permissions
@@ -1694,7 +1694,7 @@ Deprecates NodeWikiVersion, Node.wiki_pages_versions, and Node.wiki_pages_curren
 - Submitting to OSF4M using deleted project name does not create new project
 - Fangorn edit undefined
 - API 502s when refreshing github metadata (was: TypeError: Can't compare datetime.datetime to NoneType)
-- API 502s when requesting Github file metadata w/ version=2.2
+- API 502s when requesting GitHub file metadata w/ version=2.2
 - Search unhappy with some users
 - Registries: "Withdrawn" label not appearing on newly-withdrawn registrations
 - Retraction detail pages throw mithril mounting error
@@ -1759,7 +1759,7 @@ Post-release: python -m scripts.migration.migrate_meetings_preprints_to_preprint
 0.101.0 (2016-11-23)
 ====================
 - Fix renaming, download button, zip is broken on GitHub non-default branch
-- Prevent 500 error when oving a folder from a OSF in component to OSF storage in parent
+- Prevent 500 error when moving a folder from a OSF in component to OSF storage in parent
 - Ensure IE can view files in a VOL
 - Improve error messaging for attempted moves/deletes of primary file on private preprint project
 - Make comment reply filter work
@@ -1810,7 +1810,7 @@ Post-release: python -m scripts.migration.migrate_meetings_preprints_to_preprint
 0.97.0 (2016-10-20)
 ===================
 - API v2 Versioning
-- API v2 Redirect swagger docs to Browseable API
+- API v2 Redirect swagger docs to Browsable API
 - Fix wiki formatting for legacy wiki pages
 - Ensure bad file moves don't delete files
 - API v2 Make private nodes private in inter-node file moves
@@ -1925,7 +1925,7 @@ Migrations
 0.91.0 (2016-08-28)
 ===================
 
-- API Endpoints for Preprints (also includs providers and taxonomies)
+- API Endpoints for Preprints (also includes providers and taxonomies)
 - API Download Counts for OSF Storage Files
 
 Migrations
@@ -1956,7 +1956,7 @@ Migrations
 0.88.1 (2016-08-25)
 ===================
 
-- Make Github addon logging more tolerant to problems
+- Make GitHub addon logging more tolerant to problems
 
 0.88.0 (2016-08-22)
 ===================
@@ -1989,7 +1989,7 @@ Migrations
 0.87.5 (2016-08-16)
 ===================
 
-- Modify wording on ERPC langing page
+- Modify wording on ERPC landing page
 
 0.87.4 (2016-08-15)
 ===================
@@ -2110,7 +2110,7 @@ Migrations
 ===================
 
 - Use CAS for all authentication for OSF.
-- On regisration's file pages, show links to original source file.
+- On registration's file pages, show links to original source file.
 - Creating a wiki page whose name is the same as a previously deleted wiki page will no longer restore the wiki page's versions.
 - Add more contextual information about component hierarchy to the My Projects widget.
 - Add Date Modified column to file browsers.
@@ -2254,7 +2254,7 @@ See https://openscience.atlassian.net/browse/OSF-5861
 - Backend for OSF4Institutions: nodes and users can be affiliated with an institution (alpha; disabled on production).
 - Add visitor tracking with Keen.io.
 - Refactor Google Drive addon to use generic views.
-- Use Sendgrid API for sending emails; add categorization of emails.
+- Use SendGrid API for sending emails; add categorization of emails.
 - UI fixes.
 
 0.64.0 (2016-02-10)
@@ -2417,7 +2417,7 @@ Migrations
 0.50.0 (2015-09-17)
 ===================
 
-- Migration of all addon file collecitons to a single GuidFile collection.
+- Migration of all addon file collections to a single GuidFile collection.
 
 0.49.0 (2015-09-11)
 ===================
@@ -2726,7 +2726,7 @@ service when files are backed up to a Amazon Glacier archive.
 
 Hotfix release
 
-- Display warning about private Github repos on a public project on files and
+- Display warning about private GitHub repos on a public project on files and
 statistics pages.
 - Refactor celery task for rendering files so that file contents are not
 passed to message broker.
@@ -2770,7 +2770,7 @@ Lots of new UI features and responsiveness improvements.
 - Paginate search results in Add Contributor widget.
 - Speed improvements to contributor manager widget.
 - Add "ongoing" option to Education and Employment sections of user profile.
-- Improved mimetype detection when downloading a file through the Github
+- Improved mimetype detection when downloading a file through the GitHub
 addon.
 - Unread comment counts appear in comment tab.
 - Lots of bug fixes and minor UI improvements to the wiki.
@@ -2778,8 +2778,8 @@ addon.
 - Lots of UI fixes to the profile configuration pages.
 - Larger project title and description inputs.
 - Confirmation codes for project deletion are more fun =)
-- Allow multiple users to authenticate with the same Github credentials for
-the Github addon.
+- Allow multiple users to authenticate with the same GitHub credentials for
+the GitHub addon.
 - Includes all fixes from the "Sprint: Initial" milestone: https://github.com/CenterForOpenScience/openscienceframework.org/issues?q=milestone%3A%22Sprint+%3A+Initial%22+
 - Update required versions of requests, webassets, and bleach.
 
@@ -2795,7 +2795,7 @@ Schema changes
 
 - Remove fork_list and registration_list fields from Node model. NOTE: A
 migration was NOT performed to remove these fields.
-- Add AddonGithubOauthSettings model.
+- Add AddonGitHubOauthSettings model.
 - Remove oauth_access_token and oauth_token_type fields from
 AddonGitHubUserSettings model.
 
@@ -2843,11 +2843,11 @@ and prevents a number of circular import problems throughout the codebase.
 - Wiki logs link to wiki pages.
 - Add confirmation dialog when deselecting addons from the user profile page.
 - Registered users no longer have "key ring" of view-only link keys. View-only
-links will appear the same, regardless of whether you are logged in or not.
+links will appear the same, regardless of whether or not you are logged in.
 - Project deletion events are logged.
 - Developers: All deprecated Solr code removed.
 - Developers: Bower components are no longer added to the git tree. Use `bower
-install` to installthem.
+install` to install them.
 - Developers: Various improvements to logging.
 - Developers: ``URLLookup`` class is deprecated. Use ``api_url_for`` and
 ``web_url_for`` in your tests.
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 0a31e00a704..07b8fef688b 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -30,6 +30,6 @@ When submitting an issue, be as descriptive as possible:
 * Suggest a solution
     * What will it look like when this issue is resolved?
 
-Include pictures (e.g., in OSX press Cmd+Shift+4 to draw a box to screenshot)
+Include pictures (e.g., in macOS press Cmd+Shift+4 to draw a box to screenshot)
 
 Examples of good issue reporting: [#382](https://github.com/CenterForOpenScience/osf.io/issues/382), [#713](https://github.com/CenterForOpenScience/osf.io/issues/713).
diff --git a/LICENSE b/LICENSE
index c8ba85cfde6..4b74aecc744 100644
--- a/LICENSE
+++ b/LICENSE
@@ -187,7 +187,7 @@ APPENDIX: How to apply the Apache License to your work.
    same "printed page" as the copyright notice for easier
    identification within third-party archives.
 
-Copyright 2013-2018 Center for Open Science
+Copyright 2025 Center for Open Science
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/PULL_REQUEST_TEMPLATE.md b/PULL_REQUEST_TEMPLATE.md
index 9af47cda202..ad9622c6dac 100644
--- a/PULL_REQUEST_TEMPLATE.md
+++ b/PULL_REQUEST_TEMPLATE.md
@@ -36,4 +36,4 @@ Any concerns/considerations/questions that development raised?
 
 ## Ticket
 
-<!-- Link to JIRA ticket, if applicable e.g. https://openscience.atlassian.net/browse/OSF-1234 -->
+<!-- Link to Jira ticket, if applicable e.g. https://openscience.atlassian.net/browse/OSF-1234 -->
diff --git a/README-docker-compose.md b/README-docker-compose.md
index e3987b6b7bd..8e0bc875a8a 100644
--- a/README-docker-compose.md
+++ b/README-docker-compose.md
@@ -2,15 +2,15 @@
 ## Docker and OS Setup
 
 1. Install the Docker Client
-  - OSX: https://www.docker.com/products/docker#/mac
+  - macOS: https://www.docker.com/products/docker#/mac
   - Ubuntu: https://docs.docker.com/engine/installation/linux/ubuntulinux
   - Windows: https://www.docker.com/products/docker#/windows
 2. Grant the docker client additional resources (recommended minimums of 1 CPU, 8GB memory, 2GB swap, and 32GB disk image size)
-   - OSX: https://docs.docker.com/docker-for-mac/#/preferences
+   - macOS: https://docs.docker.com/docker-for-mac/#/preferences
    - Ubuntu: N/A
    - Windows: https://docs.docker.com/docker-for-windows/#advanced
-3. Setup the Operating System
-  - OSX
+3. Set up the Operating System
+  - macOS
     - Alias the loopback interface
 
     ```bash
@@ -72,7 +72,7 @@
         `netsh interface show interface`
       - Rename the interface
 
-        `netsh inteface set interface "Ethernet 2" newname="Loopback"`
+        `netsh interface set interface "Ethernet 2" newname="Loopback"`
       - Assign the Loopback interface an IP address
 
         `netsh interface ip add address "Loopback" 192.168.168.167 255.255.255.255`
@@ -124,7 +124,7 @@
 
   - Running containers with docker compose
 
-    - In `webite/settings/local.py`, disable `SEARCH_ENGINE`
+    - In `website/settings/local.py`, disable `SEARCH_ENGINE`
     ```python
     # SEARCH_ENGINE = 'elastic'
     SEARCH_ENGINE = None
diff --git a/addons.json b/addons.json
index 91f61ebd35f..57c1997c391 100644
--- a/addons.json
+++ b/addons.json
@@ -17,7 +17,8 @@
         "twofactor",
         "wiki",
         "googledrive",
-        "bitbucket"
+        "bitbucket",
+        "azureblobstorage"
     ],
     "addons_default": [
         "osfstorage"
diff --git a/admin_tests/regisration_schemas/__init__.py b/addons/azureblobstorage/__init__.py
similarity index 100%
rename from admin_tests/regisration_schemas/__init__.py
rename to addons/azureblobstorage/__init__.py
diff --git a/addons/azureblobstorage/apps.py b/addons/azureblobstorage/apps.py
new file mode 100644
index 00000000000..308f9aeba75
--- /dev/null
+++ b/addons/azureblobstorage/apps.py
@@ -0,0 +1,36 @@
+from addons.base.apps import BaseAddonAppConfig
+
+
+class AzureBlobStorageAddonAppConfig(BaseAddonAppConfig):
+
+    default = True
+    name = 'addons.azureblobstorage'
+    label = 'addons_azureblobstorage'
+    full_name = 'Azure Blob Storage'
+    short_name = 'azureblobstorage'
+    owners = ['user', 'node']
+    configs = ['accounts', 'node']
+    categories = ['storage']
+    has_hgrid_files = True
+
+    # Define actions for NodeLog
+    FOLDER_SELECTED = 'azureblobstorage_folder_selected'
+    NODE_AUTHORIZED = 'azureblobstorage_node_authorized'
+    NODE_DEAUTHORIZED = 'azureblobstorage_node_deauthorized'
+
+    actions = (FOLDER_SELECTED, NODE_AUTHORIZED, NODE_DEAUTHORIZED, )
+
+    @property
+    def routes(self):
+        # No Flask routes needed for gravyvalet-managed addon
+        return []
+
+    @property
+    def user_settings(self):
+        # No UserSettings for gravyvalet-managed addon
+        return None
+
+    @property
+    def node_settings(self):
+        # No NodeSettings for gravyvalet-managed addon
+        return None
diff --git a/addons/azureblobstorage/models.py b/addons/azureblobstorage/models.py
new file mode 100644
index 00000000000..9592ba1be27
--- /dev/null
+++ b/addons/azureblobstorage/models.py
@@ -0,0 +1,33 @@
+# -*- coding: utf-8 -*-
+
+from osf.models.files import File, Folder, BaseFileNode
+from osf.models.external import ExternalProvider
+
+class AzureBlobStorageFileNode(BaseFileNode):
+    _provider = 'azureblobstorage'
+
+
+class AzureBlobStorageFolder(AzureBlobStorageFileNode, Folder):
+    pass
+
+
+class AzureBlobStorageFile(AzureBlobStorageFileNode, File):
+    version_identifier = 'version'
+
+
+class AzureBlobStorageProvider(ExternalProvider):
+    """An alternative to `ExternalProvider` not tied to OAuth"""
+
+    name = 'Azure Blob Storage'
+    short_name = 'azureblobstorage'
+
+    def __init__(self, account=None):
+        super(AzureBlobStorageProvider, self).__init__()
+
+        self.account = account
+
+    def __repr__(self):
+        return '<{name}: {status}>'.format(
+            name=self.__class__.__name__,
+            status=self.account.display_name if self.account else 'anonymous'
+        )
diff --git a/addons/base/models.py b/addons/base/models.py
index 831284d573d..3f848a52e14 100644
--- a/addons/base/models.py
+++ b/addons/base/models.py
@@ -455,7 +455,7 @@ def before_fork(self, node, user):
         """Return warning text to display if user auth will be copied to a
         fork.
         :param Node node:
-        :param Uder user
+        :param User user
         :returns Alert message
         """
 
diff --git a/addons/base/tests/base.py b/addons/base/tests/base.py
index 406cbe0a8a5..a1c9f1756cc 100644
--- a/addons/base/tests/base.py
+++ b/addons/base/tests/base.py
@@ -13,7 +13,7 @@ class AddonTestCase:
         - ADDON_SHORT_NAME (class variable)
         - set_user_settings(self, settings): Method that makes any modifications
             to the UserSettings object, e.g. setting access_token
-        - set_node_settings(self, settings): Metehod that makes any modifications
+        - set_node_settings(self, settings): Method that makes any modifications
             to the NodeSettings object.
 
     This will give you:
diff --git a/addons/base/tests/serializers.py b/addons/base/tests/serializers.py
index 545761dcf12..932fc2d7bfd 100644
--- a/addons/base/tests/serializers.py
+++ b/addons/base/tests/serializers.py
@@ -121,7 +121,7 @@ def test_serialized_urls_checks_required(self):
             with pytest.raises(AssertionError):
                 self.ser.serialized_urls
 
-    def test_serialized_acccounts(self):
+    def test_serialized_accounts(self):
         ea = self.ExternalAccountFactory()
         self.user.external_accounts.add(ea)
 
@@ -131,7 +131,7 @@ def test_serialized_acccounts(self):
         assert len(serialized) == self.user.external_accounts.count()
         assert mock_serialize_account.call_count == len(serialized)
 
-    def test_serialize_acccount(self):
+    def test_serialize_account(self):
         ea = self.ExternalAccountFactory()
         expected = {
             'id': ea._id,
@@ -169,7 +169,7 @@ class StorageAddonSerializerTestSuiteMixin(OAuthAddonSerializerTestSuiteMixin):
     @abc.abstractmethod
     def client(self):
         """Provide a mocked version of this provider's client (i.e. the client should not make
-        acutal API calls).
+        actual API calls).
         """
         pass
 
diff --git a/addons/base/views.py b/addons/base/views.py
index 16633ddbbfd..93be2d0c26a 100644
--- a/addons/base/views.py
+++ b/addons/base/views.py
@@ -198,7 +198,7 @@ def get_auth(auth, **kwargs):
     Authenticate a request and construct a JWT payload for Waterbutler callbacks.
     When a user interacts with a file OSF sends a request to WB which itself sends a
     request to an external service or Osfstorage, in order to confirm that event has
-    taken place Waterbutler will send this callback to OSF to comfirm the file action was
+    taken place Waterbutler will send this callback to OSF to confirm the file action was
     successful and can be logged.
 
     This function decrypts and decodes the JWT payload from the request, authenticates
diff --git a/addons/bitbucket/models.py b/addons/bitbucket/models.py
index 50ebc39a2de..7945c2ab367 100644
--- a/addons/bitbucket/models.py
+++ b/addons/bitbucket/models.py
@@ -340,8 +340,8 @@ def before_page_load(self, node, user):
                     )
                 else:
                     message += (
-                        ' The files in this Bitbucket repo can be viewed on Bitbucket '
-                        '<u><a href="https://bitbucket.org/{user}/{repo}/">here</a></u>.'
+                        ' View the <u><a href="https://bitbucket.org/{user}/{repo}/">files in this repo</a></u> on Bitbucket '
+                        '.'
                     ).format(
                         user=self.user,
                         repo=self.repo,
@@ -369,8 +369,8 @@ def before_remove_contributor_message(self, node, removed):
         """
         try:
             message = (super().before_remove_contributor_message(node, removed) +
-            'You can download the contents of this repository before removing '
-            'this contributor <u><a href="{url}">here</a></u>.'.format(
+            'You can <u><a href="{url}">download the contents of this repository</a></u> before removing '
+            'this contributor.'.format(
                 url=node.api_url + 'bitbucket/tarball/'
             ))
         except TypeError:
diff --git a/addons/bitbucket/tests/test_views.py b/addons/bitbucket/tests/test_views.py
index 51cac6012b5..3b69f93a01b 100644
--- a/addons/bitbucket/tests/test_views.py
+++ b/addons/bitbucket/tests/test_views.py
@@ -63,7 +63,7 @@ def test_folder_list(self):
     @mock.patch('addons.bitbucket.views.BitbucketClient.repo')
     @mock.patch('addons.bitbucket.models.NodeSettings.external_account')
     def test_set_config(self, mock_account, mock_repo):
-        # BB selects repos, not folders, so this needs to be overriden
+        # BB selects repos, not folders, so this needs to be overridden
         mock_account.return_value = mock.Mock()
         mock_repo.return_value = 'repo_name'
         url = self.project.api_url_for(f'{self.ADDON_SHORT_NAME}_set_config')
diff --git a/addons/boa/static/boaNodeConfig.js b/addons/boa/static/boaNodeConfig.js
index 9a1d5e09a1e..60eb3a6390b 100644
--- a/addons/boa/static/boaNodeConfig.js
+++ b/addons/boa/static/boaNodeConfig.js
@@ -16,7 +16,7 @@ function ViewModel(url) {
     self.url = url;
     self.urls = ko.observable();
 
-    // Non-Oauth fields:
+    // Non-OAuth fields:
     self.username = ko.observable('');
     self.password = ko.observable('');
 
diff --git a/addons/boa/templates/boa_node_settings.mako b/addons/boa/templates/boa_node_settings.mako
index aeb171c2880..aadff91b70b 100644
--- a/addons/boa/templates/boa_node_settings.mako
+++ b/addons/boa/templates/boa_node_settings.mako
@@ -23,7 +23,7 @@
                 </a>
             </span>
 
-            <!-- Oauth Start Button -->
+            <!-- OAuth Start Button -->
             <span data-bind="if: showTokenCreateButton">
                 <a href="#boaCredentialsModal" data-toggle="modal" class="pull-right text-primary addon-auth">
                     Connect Account
diff --git a/addons/box/models.py b/addons/box/models.py
index 78002b122df..5861e74b287 100644
--- a/addons/box/models.py
+++ b/addons/box/models.py
@@ -55,7 +55,7 @@ class Provider(ExternalProvider):
     default_scopes = ['root_readwrite']
 
     def handle_callback(self, response):
-        """View called when the Oauth flow is completed. Adds a new UserSettings
+        """View called when the OAuth flow is completed. Adds a new UserSettings
         record to the user and saves the user's access token and account info.
         """
 
diff --git a/addons/dataverse/README.md b/addons/dataverse/README.md
index 773002a7b56..32cbc680714 100644
--- a/addons/dataverse/README.md
+++ b/addons/dataverse/README.md
@@ -17,7 +17,7 @@ Ensure `"dataverse"` exists in the addons list in `"addons.json"`
 
 1. Go to user settings. Under "Add-ons", select "Dataverse" and click submit.
 2. Under "Configure Add-ons", select "other dataverse provider", and enter `demo.dataverse.org/` for the url. Enter your API Token.
-3. Go to the the node settings page. Under "Select Add-ons", select "Dataverse" and click submit.
+3. Go to the node settings page. Under "Select Add-ons", select "Dataverse" and click submit.
 4. Under "Configure Add-ons", select a dataverse and dataset and click submit.
 
 ## Notes on privacy settings:
diff --git a/addons/dataverse/models.py b/addons/dataverse/models.py
index 1b4753d7cfa..7e208cdddab 100644
--- a/addons/dataverse/models.py
+++ b/addons/dataverse/models.py
@@ -27,7 +27,7 @@ def get_or_create(cls, target, path, **query_params):
         version = query_params.get('version', None)
         if version not in {'latest', 'latest-published'}:
             raise addon_errors.QueryError(
-                'Dataverse requires a "version" query paramater. '
+                'Dataverse requires a "version" query parameter. '
                 'Acceptable options are "latest" or "latest-published"'
             )
 
diff --git a/addons/dataverse/serializer.py b/addons/dataverse/serializer.py
index 0b8d66abceb..941a0afe715 100644
--- a/addons/dataverse/serializer.py
+++ b/addons/dataverse/serializer.py
@@ -38,7 +38,7 @@ def serialized_urls(self):
         addon_urls = self.addon_serialized_urls
         # Make sure developer returns set of needed urls
         for url in self.REQUIRED_URLS:
-            assert url in addon_urls, f"addon_serilized_urls must include key '{url}'"
+            assert url in addon_urls, f"addon_serialized_urls must include key '{url}'"
         ret.update(addon_urls)
         return ret
 
diff --git a/addons/dataverse/templates/dataverse_node_settings.mako b/addons/dataverse/templates/dataverse_node_settings.mako
index e818c248bbb..c773eb821a6 100644
--- a/addons/dataverse/templates/dataverse_node_settings.mako
+++ b/addons/dataverse/templates/dataverse_node_settings.mako
@@ -23,7 +23,7 @@
                 </a>
             </span>
 
-            <!-- Oauth Start Button -->
+            <!-- OAuth Start Button -->
             <span data-bind="if: showTokenCreateButton">
                 <a href="#dataverseInputCredentials" data-toggle="modal" class="pull-right text-primary addon-auth">
                     Connect  Account
diff --git a/addons/dataverse/tests/test_serializer.py b/addons/dataverse/tests/test_serializer.py
index fa781d6b81f..fcbfa7f3c8a 100644
--- a/addons/dataverse/tests/test_serializer.py
+++ b/addons/dataverse/tests/test_serializer.py
@@ -36,7 +36,7 @@ def tearDown(self):
         self.mock_api.stop()
         super().tearDown()
 
-    def test_serialize_acccount(self):
+    def test_serialize_account(self):
         ea = self.ExternalAccountFactory()
         expected = {
             'id': ea._id,
diff --git a/addons/figshare/README.md b/addons/figshare/README.md
index 1736f53b90b..59d4c07b56a 100644
--- a/addons/figshare/README.md
+++ b/addons/figshare/README.md
@@ -43,7 +43,7 @@ commit()
 
 
 ### OAuth and ngrok (alternate untested instructions)
-**Note:** It is reccomended that you follow the above instructions over the ngrok insturctions.
+**Note:** It is recommended that you follow the above instructions over the ngrok instructions.
 
 1. Download ngrok (partially free, but TLS requires [subscription](https://ngrok.com/product#pricing))
 2. Run with `ngrok tls -subdomain=openscience 5000`
diff --git a/addons/figshare/models.py b/addons/figshare/models.py
index 3b758787dce..50c34aa6734 100644
--- a/addons/figshare/models.py
+++ b/addons/figshare/models.py
@@ -71,7 +71,7 @@ class FigshareProvider(ExternalProvider):
     default_scopes = ['all']
 
     def handle_callback(self, response):
-        """View called when the Oauth flow is completed. Adds a new BoxUserSettings
+        """View called when the OAuth flow is completed. Adds a new BoxUserSettings
         record to the user and saves the user's access token and account info.
         """
         client = FigshareClient(response['access_token'])
diff --git a/addons/figshare/settings/defaults.py b/addons/figshare/settings/defaults.py
index 6cb98f84490..7d4e81c4eed 100644
--- a/addons/figshare/settings/defaults.py
+++ b/addons/figshare/settings/defaults.py
@@ -32,7 +32,7 @@
 # When this addon was originally implemented, only type 4 ("fileset") articles behaved like folders
 # and contained multiple files.  Since then, figshare has changed their API so that type 3 articles
 # ("datasets") are the default multiple-file containers.  New requests to create "fileset"s are
-# automatically converted to create "dataset"s.  Pre-exisiting "fileset"s retain the same id.  To
+# automatically converted to create "dataset"s.  Preexisting "fileset"s retain the same id.  To
 # preserve backcompat, the addon now allows both type 3 and type 4 articles to be valid root
 # folders.
 FIGSHARE_FOLDER_TYPES = {3, 4, }
diff --git a/addons/github/README.md b/addons/github/README.md
index fceba9bdff2..b58f6153b44 100644
--- a/addons/github/README.md
+++ b/addons/github/README.md
@@ -1,12 +1,12 @@
-# OSF Github Addon
+# OSF GitHub Addon
 
 ## Enabling the addon for development
 
-### Setup up on Github
+### Setup up on GitHub
 
-1. On your Github user settings, under "Developer settings" go to “OAuth Apps”
+1. On your GitHub user settings, under "Developer settings" go to “OAuth Apps”
 2. Click on "Register a new application"
-2. Enter any name for the application name, e.g. "OSF Github Addon (local)"
+2. Enter any name for the application name, e.g. "OSF GitHub Addon (local)"
 3. In the "Homepage URL" field, enter `http://localhost:5000/`
 4. In the Authorization Callback URL field, enter `http://localhost:5000/oauth/callback/github`.
 5. Submit the form.
@@ -14,15 +14,15 @@
 
 ### Enable on OSF
 1. Create a local.py for github by running `cp addons/github/settings/defaults.py addons/github/settings/local.py`
-2. Copy your client ID and client secret from Github into the new `local.py file`.
+2. Copy your client ID and client secret from GitHub into the new `local.py file`.
 3. Ensure `"github"` exists in the addons list in `"addons.json"`
 4. Restart your app server.
-5. Add Github as a provider under your project settings. Then scroll down and connect the account.
+5. Add GitHub as a provider under your project settings. Then scroll down and connect the account.
 
 
 ## Testing webhooks
 
-To test Github webhooks, your development server must be exposed to the web using a service like ngrok:
+To test GitHub webhooks, your development server must be exposed to the web using a service like ngrok:
 * brew install ngrok
 * ngrok 5000
 * Copy forwarding address to addons/github/settings/local.py:HOOK_DOMAIN
diff --git a/addons/github/api.py b/addons/github/api.py
index c19370bf0b7..09a12d480bf 100644
--- a/addons/github/api.py
+++ b/addons/github/api.py
@@ -46,7 +46,7 @@ def user(self, user=None):
         return self.gh3.user(user)
 
     def repo(self, user, repo):
-        """Get a single Github repo's info.
+        """Get a single GitHub repo's info.
 
         :param str user: GitHub user name
         :param str repo: GitHub repo name
@@ -157,7 +157,7 @@ def check_authorization(self):
 
         OAuth applications can use this method to check token validity
         without hitting normal rate limits because of failed login attempts.
-        If the token is valid, it will return True, otherwise it will return
+        If the token is valid, it will return True; otherwise, it will return
         False.
 
         :returns:
diff --git a/addons/github/models.py b/addons/github/models.py
index 89f90cbdf50..772a746e16a 100644
--- a/addons/github/models.py
+++ b/addons/github/models.py
@@ -336,8 +336,8 @@ def before_page_load(self, node, user):
                 )
             else:
                 message += (
-                    ' The files in this GitHub repo can be viewed on GitHub '
-                    '<u><a href="https://github.com/{user}/{repo}/">here</a></u>.'
+                    ' View the <u><a href="https://github.com/{user}/{repo}/">files in this repo</a></u> on GitHub '
+                    '.'
                 ).format(
                     user=self.user,
                     repo=self.repo,
@@ -355,8 +355,8 @@ def before_remove_contributor_message(self, node, removed):
         """
         try:
             message = (super().before_remove_contributor_message(node, removed) +
-            'You can download the contents of this repository before removing '
-            'this contributor <u><a href="{url}">here</a></u>.'.format(
+            'You can <u><a href="{url}">download the contents of this repository</a></u> before removing '
+            'this contributor.'.format(
                 url=node.api_url + 'github/tarball/'
             ))
         except TypeError:
diff --git a/addons/github/static/githubFangornConfig.js b/addons/github/static/githubFangornConfig.js
index a57b83d5681..ae940d508a0 100644
--- a/addons/github/static/githubFangornConfig.js
+++ b/addons/github/static/githubFangornConfig.js
@@ -1,6 +1,6 @@
 'use strict';
 /**
- * Github FileBrowser configuration module.
+ * GitHub FileBrowser configuration module.
  */
 
 var m = require('mithril');
@@ -83,7 +83,7 @@ function _removeEvent (event, items) {
             var parent = items[0].parent();
             var mithrilContentSingle = m('div', [
                 m('p', 'This action is irreversible.'),
-                parent.children.length < 2 ? m('p', 'If a folder in Github has no children it will automatically be removed.') : ''
+                parent.children.length < 2 ? m('p', 'If a folder in GitHub has no children it will automatically be removed.') : ''
             ]);
             var mithrilButtonsSingle = m('div', [
                 m('span.btn.btn-default', {
@@ -344,7 +344,7 @@ function gotoFile (item) {
     }
 }
 
-function _fangornGithubTitle(item, col)  {
+function _fangornGitHubTitle(item, col)  {
     var tb = this;
     if (item.data.isAddonRoot && item.connected === false) { // as opposed to undefined, avoids unnecessary setting of this value
         return Fangorn.Utils.connectCheckTemplate.call(this, item);
@@ -383,7 +383,7 @@ function _fangornColumns (item) {
         data : 'name',
         folderIcons : true,
         filter: true,
-        custom : _fangornGithubTitle
+        custom : _fangornGitHubTitle
     });
 
     if(tb.options.placement === 'project-files') {
diff --git a/addons/github/templates/github_node_settings.mako b/addons/github/templates/github_node_settings.mako
index ed279456ddd..d90dda06bb9 100644
--- a/addons/github/templates/github_node_settings.mako
+++ b/addons/github/templates/github_node_settings.mako
@@ -2,7 +2,7 @@
 
     <div>
         <h4 class="addon-title">
-            <img class="addon-icon" src="${addon_icon_url}" aria-label="Github icon" alt="Github icon">
+            <img class="addon-icon" src="${addon_icon_url}" aria-label="GitHub icon" alt="GitHub icon">
             GitHub
             <small class="authorized-by">
                 % if node_has_auth:
diff --git a/addons/github/tests/test_views.py b/addons/github/tests/test_views.py
index 121c5355485..88bb4d27992 100644
--- a/addons/github/tests/test_views.py
+++ b/addons/github/tests/test_views.py
@@ -60,7 +60,7 @@ def test_folder_list(self):
     @mock.patch('addons.github.models.NodeSettings.add_hook')
     @mock.patch('addons.github.views.GitHubClient.repo')
     def test_set_config(self, mock_repo, mock_add_hook):
-        # GH selects repos, not folders, so this needs to be overriden
+        # GH selects repos, not folders, so this needs to be overridden
         mock_repo.return_value = 'repo_name'
         url = self.project.api_url_for(f'{self.ADDON_SHORT_NAME}_set_config')
         res = self.app.post(url, json={
diff --git a/addons/github/tests/utils.py b/addons/github/tests/utils.py
index 61ed45d6bbe..2ab725dd41d 100644
--- a/addons/github/tests/utils.py
+++ b/addons/github/tests/utils.py
@@ -41,7 +41,7 @@ def create_mock_github(user='octo-cat', private=False):
         ...   u'url': u'https://api.github.com/repos/octocat/mock-repo/commits/c6eaaf6708561c3d4439c0c8dd99c2e33525b1e6'},
         ...  u'name': u'no-bundle'}]
 
-    :param str user: Github username.
+    :param str user: GitHub username.
     :param bool private: Whether repo is private.
     :return: An autospecced GitHub Mock object
     """
diff --git a/addons/github/utils.py b/addons/github/utils.py
index 3791047c4aa..4fbdbdf950f 100644
--- a/addons/github/utils.py
+++ b/addons/github/utils.py
@@ -29,7 +29,7 @@ def make_hook_secret():
 HOOK_SIGNATURE_KEY = 'X-Hub-Signature'
 def verify_hook_signature(node_settings, data, headers):
     """Verify hook signature.
-    :param GithubNodeSettings node_settings:
+    :param GitHubNodeSettings node_settings:
     :param dict data: JSON response body
     :param dict headers: Request headers
     :raises: HookError if signature is missing or invalid
diff --git a/addons/gitlab/README.md b/addons/gitlab/README.md
index 22282849c70..74ea6f9e90b 100644
--- a/addons/gitlab/README.md
+++ b/addons/gitlab/README.md
@@ -5,6 +5,6 @@
 4. In the Redirect URI field, enter the full URL for your OSF instance + "/oauth/callback/gitlab/",
  e.g "http://localhost:5000/oauth/callback/gitlab/". Make sure you use the slash in the end
 5. Click on 'Save application' button to submit the form
-6. Go to your project settings on OSF, click on the Addons menu and then on Gitlab
+6. Go to your project settings on OSF, click on the Addons menu and then on GitLab
 7. Copy your Application ID and Secret from GitLab into the form
 8. Save the form and you are ready to go.
diff --git a/addons/gitlab/api.py b/addons/gitlab/api.py
index 04ccb2c1b3a..1caacf22a82 100644
--- a/addons/gitlab/api.py
+++ b/addons/gitlab/api.py
@@ -40,7 +40,7 @@ def repo(self, repo_id):
         https://docs.gitlab.com/ce/api/projects.html#get-single-project
 
         :param str repo_id: GitLab repository id
-        :return: gitlab.Project a object representing the repo
+        :return: gitlab.Project an object representing the repo
         """
 
         try:
@@ -58,8 +58,8 @@ def repos(self, all=False):
             return self.gitlab.projects.list(membership=True, all=all)
         except gitlab.GitlabAuthenticationError:
             raise HTTPError(http_status.HTTP_403_FORBIDDEN, data={
-                'message_long': 'Your Gitlab token is deleted or invalid you may disconnect your Gitlab account and '
-                                'reconnect with a valid token <a href="/settings/addons/">here</a>.'
+                'message_long': 'Your GitLab token is deleted or invalid you may <a href="/settings/addons/">disconnect '
+                                'your GitLab account and reconnect with a valid token</a>.'
             })
 
     def branches(self, repo_id, branch=None):
diff --git a/addons/gitlab/models.py b/addons/gitlab/models.py
index 42b5d7991e0..f1a30995d48 100644
--- a/addons/gitlab/models.py
+++ b/addons/gitlab/models.py
@@ -277,7 +277,7 @@ def before_page_load(self, node, user):
             return
         except gitlab.exceptions.GitlabError as exc:
             if exc.response_code == 403 and 'must accept the Terms of Service' in exc.error_message:
-                return [('Your gitlab account does not have proper authentication. Ensure you have agreed to Gitlab\'s '
+                return [('Your gitlab account does not have proper authentication. Ensure you have agreed to GitLab\'s '
                          'current Terms of Service by disabling and re-enabling your account.')]
             else:
                 raise exc
@@ -302,8 +302,8 @@ def before_page_load(self, node, user):
                 )
             else:
                 message += (
-                    ' The files in this GitLab repo can be viewed on GitLab '
-                    '<u><a href="{url}" aria-label="github link" >here</a></u>.'
+                    ' View the <u><a href="{url}">files in this repo</a></u> on GitLab '
+                    '.'
                 ).format(url=repo.http_url_to_repo)
             messages.append(message)
             return messages
@@ -318,8 +318,8 @@ def before_remove_contributor_message(self, node, removed):
         """
         try:
             message = (super().before_remove_contributor_message(node, removed) +
-            'You can download the contents of this repository before removing '
-            'this contributor <u><a href="{url}">here</a></u>.'.format(
+            'You can <u><a href="{url}">download the contents of this repository</a></u> before removing '
+            'this contributor.'.format(
                 url=node.api_url + 'gitlab/tarball/'
             ))
         except TypeError:
diff --git a/addons/gitlab/static/gitlabNodeConfig.js b/addons/gitlab/static/gitlabNodeConfig.js
index 1b1d80f51d1..b23b34d4e12 100644
--- a/addons/gitlab/static/gitlabNodeConfig.js
+++ b/addons/gitlab/static/gitlabNodeConfig.js
@@ -18,7 +18,7 @@ var connectExistingAccount = function(accountId) {
                 window.location.reload();
         }).fail(function(){
             $.osf.growl('Error', 'Your account could not be connected, if the problem persists you may need to' +
-             ' reconnect to Gitlab or contact us at ' + $.osf.osfSupportLink() + '.');
+             ' reconnect to GitLab or contact us at ' + $.osf.osfSupportLink() + '.');
             Raven.captureMessage('Unexpected error occurred in JSON request');
         });
 };
diff --git a/addons/gitlab/tests/test_serializer.py b/addons/gitlab/tests/test_serializer.py
index 8ba6ef237f4..b8f8c60e9a4 100644
--- a/addons/gitlab/tests/test_serializer.py
+++ b/addons/gitlab/tests/test_serializer.py
@@ -33,7 +33,7 @@ def tearDown(self):
         self.mock_api_user.stop()
         super().tearDown()
 
-    def test_serialize_acccount(self):
+    def test_serialize_account(self):
         ea = self.ExternalAccountFactory()
         expected = {
             'id': ea._id,
diff --git a/addons/gitlab/tests/test_views.py b/addons/gitlab/tests/test_views.py
index 312e777bcce..88fffd18299 100644
--- a/addons/gitlab/tests/test_views.py
+++ b/addons/gitlab/tests/test_views.py
@@ -73,7 +73,7 @@ def test_folder_list(self):
     @mock.patch('addons.gitlab.models.NodeSettings.add_hook')
     @mock.patch('addons.gitlab.views.GitLabClient.repo')
     def test_set_config(self, mock_repo, mock_add_hook):
-        # GH selects repos, not folders, so this needs to be overriden
+        # GH selects repos, not folders, so this needs to be overridden
         mock_repo.return_value = 'repo_name'
         url = self.project.api_url_for(f'{self.ADDON_SHORT_NAME}_set_config')
         res = self.app.post(url, json={
diff --git a/addons/gitlab/views.py b/addons/gitlab/views.py
index 5e21cd1086f..04311f13663 100644
--- a/addons/gitlab/views.py
+++ b/addons/gitlab/views.py
@@ -161,7 +161,7 @@ def gitlab_set_config(auth, **kwargs):
         repo = connection.repo(gitlab_repo_id)
     except gitlab.exceptions.GitlabError as exc:
         if exc.response_code == 403 and 'must accept the Terms of Service' in exc.error_message:
-            return {'message': 'Your gitlab account does not have proper authentication. Ensure you have agreed to Gitlab\'s '
+            return {'message': 'Your gitlab account does not have proper authentication. Ensure you have agreed to GitLab\'s '
                      'current Terms of Service by disabling and re-enabling your account.'}, http_status.HTTP_400_BAD_REQUEST
 
     if repo is None:
diff --git a/addons/googledrive/settings/defaults.py b/addons/googledrive/settings/defaults.py
index d38f0ce494a..b545e3ad130 100644
--- a/addons/googledrive/settings/defaults.py
+++ b/addons/googledrive/settings/defaults.py
@@ -1,5 +1,5 @@
 # Drive credentials
-CLIENT_ID = 'chaneme'
+CLIENT_ID = 'changeme'
 CLIENT_SECRET = 'changeme'
 
 #https://developers.google.com/identity/protocols/OAuth2#expiration
diff --git a/addons/mendeley/tests/utils.py b/addons/mendeley/tests/utils.py
index da3e6f51734..805b07efb11 100644
--- a/addons/mendeley/tests/utils.py
+++ b/addons/mendeley/tests/utils.py
@@ -162,9 +162,9 @@ def set_node_settings(self, settings):
                           },
                   'keywords': [
                             'Collaborative filtering',
-                            'Extensions to recommander systems',
+                            'Extensions to recommender systems',
                             'Rating estimation methods',
-                            'Recommander systems'
+                            'Recommender systems'
                           ],
                   'created': '2015-02-13T18:17:48.000Z',
                   'profile_id': '53f383b4-1100-30d5-9473-2dde614dfcaa',
diff --git a/addons/onedrive/models.py b/addons/onedrive/models.py
index 432fc3566d2..880bd9b4b02 100644
--- a/addons/onedrive/models.py
+++ b/addons/onedrive/models.py
@@ -52,7 +52,7 @@ class OneDriveProvider(ExternalProvider):
     refresh_time = settings.REFRESH_TIME
 
     def handle_callback(self, response):
-        """View called when the Oauth flow is completed. Adds a new OneDriveUserSettings
+        """View called when the OAuth flow is completed. Adds a new OneDriveUserSettings
         record to the user and saves the user's access token and account info.
         """
         client = OneDriveClient(response['access_token'])
diff --git a/addons/osfstorage/tests/test_models.py b/addons/osfstorage/tests/test_models.py
index 24059b73bea..edf1dbce0eb 100644
--- a/addons/osfstorage/tests/test_models.py
+++ b/addons/osfstorage/tests/test_models.py
@@ -755,7 +755,7 @@ def test_after_fork_copies_versions(self, node, node_settings, auth_obj):
 
     def test_fork_reverts_to_node_storage_region(self, user2, region, region2, node, child_node_with_different_region):
         """
-        Despite different user regions defaults, the forked node always stay in the same region as it's orginal node.
+        Despite different user regions defaults, the forked node always stay in the same region as it's original node.
         """
         fork = node.fork_node(Auth(user2))
         assert fork.get_addon('osfstorage').region_id == region.id
diff --git a/addons/osfstorage/tests/test_views.py b/addons/osfstorage/tests/test_views.py
index d6c1fffff33..23df3a136fd 100644
--- a/addons/osfstorage/tests/test_views.py
+++ b/addons/osfstorage/tests/test_views.py
@@ -78,7 +78,7 @@ def test_empty(self):
         assert isinstance(res.json, list)
         assert res.json == []
 
-    def test_file_metdata(self):
+    def test_file_metadata(self):
         path = 'kind/of/magíc.mp3'
         record = recursively_create_file(self.node_settings, path)
         version = factories.FileVersionFactory()
@@ -373,7 +373,7 @@ def test_upload_duplicate(self):
 
     def test_upload_create_child(self):
         name = 'ლ(ಠ益ಠლ).unicode'
-        parent = self.node_settings.get_root().append_folder('cheesey')
+        parent = self.node_settings.get_root().append_folder('cheesy')
         res = self.send_upload_hook(parent, payload=self.make_payload(name=name))
 
         assert res.status_code == 201
@@ -394,7 +394,7 @@ def test_upload_create_child(self):
     def test_upload_create_child_with_same_name(self):
         name = 'ლ(ಠ益ಠლ).unicode'
         self.node_settings.get_root().append_file(name)
-        parent = self.node_settings.get_root().append_folder('cheesey')
+        parent = self.node_settings.get_root().append_folder('cheesy')
         res = self.send_upload_hook(parent, payload=self.make_payload(name=name))
 
         assert res.status_code == 201
@@ -426,7 +426,7 @@ def test_upload_fail_to_create_version_due_to_checkout(self):
 
     def test_update_nested_child(self):
         name = 'ლ(ಠ益ಠლ).unicode'
-        parent = self.node_settings.get_root().append_folder('cheesey')
+        parent = self.node_settings.get_root().append_folder('cheesy')
         old_node = parent.append_file(name)
 
         res = self.send_upload_hook(parent, payload=self.make_payload(name=name))
@@ -451,7 +451,7 @@ def test_update_nested_child(self):
 
     def test_upload_weird_name(self):
         name = 'another/dir/carpe.png'
-        parent = self.node_settings.get_root().append_folder('cheesey')
+        parent = self.node_settings.get_root().append_folder('cheesy')
         res = self.send_upload_hook(parent, payload=self.make_payload(name=name))
 
         assert res.status_code == 400
@@ -459,7 +459,7 @@ def test_upload_weird_name(self):
 
     def test_upload_to_file(self):
         name = 'carpe.png'
-        parent = self.node_settings.get_root().append_file('cheesey')
+        parent = self.node_settings.get_root().append_file('cheesy')
         res = self.send_upload_hook(parent, payload=self.make_payload(name=name))
 
         assert parent.is_file
@@ -549,7 +549,7 @@ def test_upload_duplicate(self):
 
     def test_upload_create_child(self):
         name = 'ლ(ಠ益ಠლ).unicode'
-        parent = self.preprint.root_folder.append_folder('cheesey')
+        parent = self.preprint.root_folder.append_folder('cheesy')
         res = self.send_upload_hook(parent, self.preprint, self.make_payload(name=name))
 
         assert res.status_code == 201
@@ -569,7 +569,7 @@ def test_upload_create_child(self):
     def test_upload_create_child_with_same_name(self):
         name = 'ლ(ಠ益ಠლ).unicode'
         self.preprint.root_folder.append_file(name)
-        parent = self.preprint.root_folder.append_folder('cheesey')
+        parent = self.preprint.root_folder.append_folder('cheesy')
         res = self.send_upload_hook(parent, self.preprint, self.make_payload(name=name))
 
         assert res.status_code == 201
@@ -600,7 +600,7 @@ def test_upload_fail_to_create_version_due_to_checkout(self):
 
     def test_update_nested_child(self):
         name = 'ლ(ಠ益ಠლ).unicode'
-        parent = self.preprint.root_folder.append_folder('cheesey')
+        parent = self.preprint.root_folder.append_folder('cheesy')
         old_node = parent.append_file(name)
 
         res = self.send_upload_hook(parent, self.preprint, self.make_payload(name=name))
@@ -625,7 +625,7 @@ def test_update_nested_child(self):
 
     def test_upload_weird_name(self):
         name = 'another/dir/carpe.png'
-        parent = self.preprint.root_folder.append_folder('cheesey')
+        parent = self.preprint.root_folder.append_folder('cheesy')
         res = self.send_upload_hook(parent, self.preprint, self.make_payload(name=name))
 
         assert res.status_code == 400
@@ -633,7 +633,7 @@ def test_upload_weird_name(self):
 
     def test_upload_to_file(self):
         name = 'carpe.png'
-        parent = self.preprint.root_folder.append_file('cheesey')
+        parent = self.preprint.root_folder.append_file('cheesy')
         res = self.send_upload_hook(parent, self.preprint, self.make_payload(name=name))
 
         assert parent.is_file
@@ -1452,7 +1452,7 @@ def test_download_file(self):
         redirect = self.app.get(url, auth=self.user.auth)
         assert redirect.status_code == 302
 
-        # Test nonexistant file 404's
+        # Test nonexistent file 404's
         url = base_url.format('FakeGuid')
         redirect = self.app.get(url, auth=self.user.auth)
         assert redirect.status_code == 404
@@ -1558,7 +1558,7 @@ def test_download_file(self):
         redirect = self.app.get(url, auth=self.user.auth)
         assert redirect.status_code == 302
 
-        # Test nonexistant file 404's
+        # Test nonexistent file 404's
         url = base_url.format('FakeGuid')
         redirect = self.app.get(url, auth=self.user.auth)
         assert redirect.status_code == 404
diff --git a/addons/owncloud/static/owncloudAnonymousLogActionList.json b/addons/owncloud/static/owncloudAnonymousLogActionList.json
index 271d2d5d244..414d8557aee 100644
--- a/addons/owncloud/static/owncloudAnonymousLogActionList.json
+++ b/addons/owncloud/static/owncloudAnonymousLogActionList.json
@@ -3,7 +3,7 @@
     "owncloud_file_removed" : "A user removed a file from ownCloud in a project",
     "owncloud_file_updated" : "A user updated a file in ownCloud in a project",
     "owncloud_folder_created" : "A user created a folder in ownCloud in a project",
-    "owncloud_folder_selected" : "A user linked a ownCloud folder in a project",
+    "owncloud_folder_selected" : "A user linked an ownCloud folder in a project",
     "owncloud_node_authorized" : "A user authorized the ownCloud addon for a project",
     "owncloud_node_deauthorized" : "A user deauthorized the ownCloud addon for a project",
     "owncloud_node_deauthorized_no_user" : "ownCloud addon for a project deauthorized"
diff --git a/addons/owncloud/static/owncloudNodeConfig.js b/addons/owncloud/static/owncloudNodeConfig.js
index b3760efbee4..528196bdcfd 100644
--- a/addons/owncloud/static/owncloudNodeConfig.js
+++ b/addons/owncloud/static/owncloudNodeConfig.js
@@ -16,7 +16,7 @@ var ViewModel = oop.extend(OauthAddonFolderPicker,{
         // TODO: [OSF-7069]
         self.super.super.constructor.call(self, addonName, url, selector, folderPicker, tbOpts);
         self.super.construct.call(self, addonName, url, selector, folderPicker, opts, tbOpts);
-        // Non-Oauth fields:
+        // Non-OAuth fields:
         self.username = ko.observable('');
         self.password = ko.observable('');
         self.hosts = ko.observableArray([]);
diff --git a/addons/owncloud/templates/owncloud_node_settings.mako b/addons/owncloud/templates/owncloud_node_settings.mako
index 1ca393b9235..be20a768ce0 100644
--- a/addons/owncloud/templates/owncloud_node_settings.mako
+++ b/addons/owncloud/templates/owncloud_node_settings.mako
@@ -23,7 +23,7 @@
                 </a>
             </span>
 
-            <!-- Oauth Start Button -->
+            <!-- OAuth Start Button -->
             <span data-bind="if: showTokenCreateButton">
                 <a href="#ownCloudCredentialsModal" data-toggle="modal" class="pull-right text-primary addon-auth">
                     Connect  Account
diff --git a/addons/s3/static/s3NodeConfig.js b/addons/s3/static/s3NodeConfig.js
index 521e4749db9..74a8f488ced 100644
--- a/addons/s3/static/s3NodeConfig.js
+++ b/addons/s3/static/s3NodeConfig.js
@@ -202,8 +202,8 @@ var s3FolderPickerViewModel = oop.extend(OauthAddonFolderPicker, {
                                     '</div>' +
                                 '</div>' +
                             '</form>' +
-                            '<span>For more information on locations, click ' +
-                                '<a href="http://help.osf.io/m/addons/l/863985">here</a>' +
+                            '<span>See <a href="http://help.osf.io/m/addons/l/863985">more ' +
+                                'information on locations</a>' +
                             '</span>' +
                         '</div>' +
                     '</div>',
diff --git a/addons/s3/templates/s3_node_settings.mako b/addons/s3/templates/s3_node_settings.mako
index 66123ba00c2..9386f4843af 100644
--- a/addons/s3/templates/s3_node_settings.mako
+++ b/addons/s3/templates/s3_node_settings.mako
@@ -29,7 +29,7 @@
                 </p>
             </span>
 
-            <!-- Oauth Start Button -->
+            <!-- OAuth Start Button -->
             <span data-bind="if: showTokenCreateButton">
                 <a href="#s3InputCredentials" data-toggle="modal" class="pull-right text-primary addon-auth">
                     Connect  Account
diff --git a/addons/s3/tests/test_view.py b/addons/s3/tests/test_view.py
index c0b9fb83d0b..8d240a4d511 100644
--- a/addons/s3/tests/test_view.py
+++ b/addons/s3/tests/test_view.py
@@ -222,7 +222,7 @@ def test_names(self):
 
     def test_bad_locations(self):
         assert not validate_bucket_location('Venus')
-        assert not validate_bucket_location('AlphaCentari')
+        assert not validate_bucket_location('AlphaCentauri')
         assert not validate_bucket_location('CostaRica')
 
     def test_locations(self):
diff --git a/addons/s3/utils.py b/addons/s3/utils.py
index 521bcec6d29..ff2abba9480 100644
--- a/addons/s3/utils.py
+++ b/addons/s3/utils.py
@@ -78,7 +78,7 @@ def create_bucket(node_settings, bucket_name, location=''):
 
 
 def bucket_exists(access_key, secret_key, bucket_name):
-    """Tests for the existance of a bucket and if the user
+    """Tests for the existence of a bucket and if the user
     can access it with the given keys
     """
     if not bucket_name:
diff --git a/addons/twofactor/static/twoFactorUserConfig.js b/addons/twofactor/static/twoFactorUserConfig.js
index 278f3ad8e35..d16cd9c4494 100644
--- a/addons/twofactor/static/twoFactorUserConfig.js
+++ b/addons/twofactor/static/twoFactorUserConfig.js
@@ -43,7 +43,7 @@ ViewModel.prototype.updateFromData = function(data) {
     if (self.isEnabled()) {
         // Initialize QR Code
         if (!self.urls.otpauth) {
-            throw new Error('Tried to initialize jQuery.fn.qrcode without a otpauth URL');
+            throw new Error('Tried to initialize jQuery.fn.qrcode without an otpauth URL');
         } else {
             $(self.qrCodeSelector).qrcode(self.urls.otpauth);
         }
diff --git a/addons/wiki/models.py b/addons/wiki/models.py
index 27c4dd04f25..9c953db976f 100644
--- a/addons/wiki/models.py
+++ b/addons/wiki/models.py
@@ -82,7 +82,7 @@ def build_html_output(content, node):
 def render_content(content, node):
     html_output = build_html_output(content, node)
 
-    # linkify gets called after santize, because we're adding rel="nofollow"
+    # linkify gets called after sanitize, because we're adding rel="nofollow"
     #   to <a> elements - but don't want to allow them for other elements.
     sanitized_content = sanitize(html_output, **settings.WIKI_WHITELIST)
     return sanitized_content
diff --git a/addons/wiki/routes.py b/addons/wiki/routes.py
index 62e3b954f52..ed6b1b3a517 100644
--- a/addons/wiki/routes.py
+++ b/addons/wiki/routes.py
@@ -30,7 +30,7 @@
             OsfWebRenderer('edit.mako', trust=False, template_dir=TEMPLATE_DIR)
         ),
 
-        # View (Id) | GET
+        # View (ID) | GET
         Rule(
             [
                 '/project/<pid>/wiki/id/<wid>/',
diff --git a/addons/wiki/static/pagedown-ace/Markdown.Converter.js b/addons/wiki/static/pagedown-ace/Markdown.Converter.js
index a8f7a865a62..6b23a76ab23 100644
--- a/addons/wiki/static/pagedown-ace/Markdown.Converter.js
+++ b/addons/wiki/static/pagedown-ace/Markdown.Converter.js
@@ -19,10 +19,10 @@ else
 //
 // More importantly, Showdown behaves like markdown.pl in most
 // edge cases.  So web applications can do client-side preview
-// in Javascript, and then build identical HTML on the server.
+// in JavaScript, and then build identical HTML on the server.
 //
 // This port needs the new RegExp functionality of ECMA 262,
-// 3rd Edition (i.e. Javascript 1.5).  Most modern web browsers
+// 3rd Edition (i.e. JavaScript 1.5).  Most modern web browsers
 // should do fine.  Even with the new regular expression features,
 // We do a lot of work to emulate Perl's regex functionality.
 // The tricky changes in this file mostly have the "attacklab:"
@@ -172,7 +172,7 @@ else
 
             // attacklab: Replace ~ with ~T
             // This lets us use tilde as an escape char to avoid md5 hashes
-            // The choice of character is arbitray; anything that isn't
+            // The choice of character is arbitrary; anything that isn't
             // magic in Markdown will work.
             text = text.replace(/~/g, "~T");
 
@@ -804,7 +804,7 @@ else
             // http://bugs.webkit.org/show_bug.cgi?id=11231
             text += "~0";
 
-            // Re-usable pattern to match any entirel ul or ol list:
+            // Re-usable pattern to match any entire ul or ol list:
 
             /*
             var whole_list = /
@@ -944,7 +944,7 @@ else
                         // Recursion for sub-lists:
                         item = _DoLists(_Outdent(item), /* isInsideParagraphlessListItem= */ true);
                         item = item.replace(/\n$/, ""); // chomp(item)
-                        if (!isInsideParagraphlessListItem) // only the outer-most item should run this, otherwise it's run multiple times for the inner ones
+                        if (!isInsideParagraphlessListItem) // only the outer-most item should run this; otherwise, it's run multiple times for the inner ones
                             item = _RunSpanGamut(item);
                     }
                     last_item_had_a_double_newline = ends_with_double_newline;
@@ -1021,7 +1021,7 @@ else
             //      <p>Just type <code>foo `bar` baz</code> at the prompt.</p>
             //
             //   There's no arbitrary limit to the number of backticks you
-            //   can use as delimters. If you need three consecutive backticks
+            //   can use as delimiters. If you need three consecutive backticks
             //   in your code, use four for delimiters, etc.
             //
             // * You can use spaces to get literal backticks at the edges:
diff --git a/addons/wiki/static/pagedown-ace/Markdown.Editor.js b/addons/wiki/static/pagedown-ace/Markdown.Editor.js
index 4a097c9175d..118e83cd10c 100644
--- a/addons/wiki/static/pagedown-ace/Markdown.Editor.js
+++ b/addons/wiki/static/pagedown-ace/Markdown.Editor.js
@@ -237,7 +237,7 @@ $(function(){
     function Chunks() { }
 
     // startRegex: a regular expression to find the start tag
-    // endRegex: a regular expresssion to find the end tag
+    // endRegex: a regular expression to find the end tag
     Chunks.prototype.findTags = function (startRegex, endRegex) {
 
         var chunkObj = this;
@@ -370,7 +370,7 @@ $(function(){
     // this issue:
     // Internet explorer has problems with CSS sprite buttons that use HTML
     // lists.  When you click on the background image "button", IE will
-    // select the non-existent link text and discard the selection in the
+    // select the nonexistent link text and discard the selection in the
     // textarea.  The solution to this is to cache the textarea selection
     // on the button's mousedown event and set a flag.  In the part of the
     // code where we need to grab the selection, we check for the flag
@@ -946,7 +946,7 @@ $(function(){
             */
         };
 
-        // Gets a collection of HTML chunks from the inptut textarea.
+        // Gets a collection of HTML chunks from the input textarea.
         this.getChunks = function () {
 
             var chunk = new Chunks();
@@ -1535,7 +1535,7 @@ $(function(){
 
                 var chunks = state.getChunks();
 
-                // Some commands launch a "modal" prompt dialog.  Javascript
+                // Some commands launch a "modal" prompt dialog.  JavaScript
                 // can't really make a modal dialog box and the WMD code
                 // will continue to execute while the dialog is displayed.
                 // This prevents the dialog pattern I'm used to and means
@@ -1944,13 +1944,13 @@ $(function(){
     };
 
     // takes the line as entered into the add link/as image dialog and makes
-    // sure the URL and the optinal title are "nice".
+    // sure the URL and the optional title are "nice".
     function properlyEncoded(linkdef) {
         return linkdef.replace(/^\s*(.*?)(?:\s+"(.+)")?\s*$/, function (wholematch, link, title) {
             link = link.replace(/\?.*$/, function (querypart) {
                 return querypart.replace(/\+/g, " "); // in the query string, a plus and a space are identical
             });
-            link = decodeURIComponent(link); // unencode first, to prevent double encoding
+            link = decodeURIComponent(link); // decode first, to prevent double encoding
             link = encodeURI(link).replace(/'/g, '%27').replace(/\(/g, '%28').replace(/\)/g, '%29');
             link = link.replace(/\?.*$/, function (querypart) {
                 return querypart.replace(/\+/g, "%2b"); // since we replaced plus with spaces in the query part, all pluses that now appear where originally encoded
@@ -2145,13 +2145,13 @@ $(function(){
         // Go backwards as many lines a possible, such that each line
         //  a) starts with ">", or
         //  b) is almost empty, except for whitespace, or
-        //  c) is preceeded by an unbroken chain of non-empty lines
+        //  c) is preceded by an unbroken chain of non-empty lines
         //     leading up to a line that starts with ">" and at least one more character
         // and in addition
         //  d) at least one line fulfills a)
         //
         // Since this is essentially a backwards-moving regex, it's susceptible to
-        // catstrophic backtracking and can cause the browser to hang;
+        // catastrophic backtracking and can cause the browser to hang;
         // see e.g. http://meta.stackoverflow.com/questions/9807.
         //
         // Hence we replaced this by a simple state machine that just goes through the
diff --git a/addons/wiki/static/pagedown-ace/Markdown.Sanitizer.js b/addons/wiki/static/pagedown-ace/Markdown.Sanitizer.js
index 6e5d27c0fb4..c1936720d48 100644
--- a/addons/wiki/static/pagedown-ace/Markdown.Sanitizer.js
+++ b/addons/wiki/static/pagedown-ace/Markdown.Sanitizer.js
@@ -49,7 +49,7 @@
 
         var re = /<\/?\w+[^>]*(\s|$|>)/g;
         // convert everything to lower case; this makes
-        // our case insensitive comparisons easier
+        // our case-insensitive comparisons easier
         var tags = html.toLowerCase().match(re);
 
         // no HTML tags present? nothing to do; exit now
diff --git a/addons/wiki/tests/test_views.py b/addons/wiki/tests/test_views.py
index 646d03c5e15..da92fafbab1 100644
--- a/addons/wiki/tests/test_views.py
+++ b/addons/wiki/tests/test_views.py
@@ -52,7 +52,7 @@ def test_default_is_current(self):
     def test_wiki_content(self):
         # Wiki has correct content
         assert WikiVersion.objects.get_for_node(self.project, 'home').content == 'Hello world'
-        # user updates the wiki a second time
+        # user updates the wiki again
         self.wiki_page.update(self.user, 'Hola mundo')
         # Both versions have the expected content
         assert WikiVersion.objects.get_for_node(self.project, 'home', 2).content == 'Hola mundo'
@@ -61,7 +61,7 @@ def test_wiki_content(self):
     def test_current(self):
         # Wiki is current
         assert WikiVersion.objects.get_for_node(self.project, 'home', 1).is_current is True
-        # user updates the wiki a second time
+        # user updates the wiki again
         self.wiki_page.update(self.user, 'Hola mundo')
         # New version is current, old version is not
         assert WikiVersion.objects.get_for_node(self.project, 'home', 2).is_current is True
@@ -70,7 +70,7 @@ def test_current(self):
     def test_update_log(self):
         # Updates are logged
         assert self.project.logs.latest().action == 'wiki_updated'
-        # user updates the wiki a second time
+        # user updates the wiki again
         self.wiki_page.update(self.user, 'Hola mundo')
         # There are two update logs
         assert self.project.logs.filter(action='wiki_updated').count() == 2
diff --git a/addons/zotero/templates/zotero_node_settings.mako b/addons/zotero/templates/zotero_node_settings.mako
index 87eae14be13..e275c1c8036 100644
--- a/addons/zotero/templates/zotero_node_settings.mako
+++ b/addons/zotero/templates/zotero_node_settings.mako
@@ -25,7 +25,7 @@
                 </p>
             </span>
 
-            <!-- Oauth Start Button -->
+            <!-- OAuth Start Button -->
             <span data-bind="if: showTokenCreateButton">
                 <a data-bind="click: connectAccount" class="text-primary pull-right addon-auth">
                   Connect Account
diff --git a/addons/zotero/tests/utils.py b/addons/zotero/tests/utils.py
index b08e6769921..5da2662e8d9 100644
--- a/addons/zotero/tests/utils.py
+++ b/addons/zotero/tests/utils.py
@@ -191,9 +191,9 @@ def set_node_settings(self, settings):
             },
             'keywords': [
                 'Collaborative filtering',
-                'Extensions to recommander systems',
+                'Extensions to recommender systems',
                 'Rating estimation methods',
-                'Recommander systems'
+                'Recommender systems'
             ],
             'created': '2015-02-13T18:17:48.000Z',
             'profile_id': '53f383b4-1100-30d5-9473-2dde614dfcaa',
diff --git a/admin/base/settings/defaults.py b/admin/base/settings/defaults.py
index 579b920949e..3d89c8d3d04 100644
--- a/admin/base/settings/defaults.py
+++ b/admin/base/settings/defaults.py
@@ -4,7 +4,7 @@
 
 from django.contrib import messages
 from api.base.settings import *  # noqa
-# TODO ALL SETTINGS FROM API WILL BE IMPORTED AND WILL NEED TO BE OVERRRIDEN
+# TODO ALL SETTINGS FROM API WILL BE IMPORTED AND WILL NEED TO BE OVERRIDDEN
 # TODO THIS IS A STEP TOWARD INTEGRATING ADMIN & API INTO ONE PROJECT
 
 # import local  # Build own local.py (used with postgres)
@@ -60,7 +60,7 @@
 # Email settings. Account created for testing. Password shouldn't be hardcoded
 EMAIL_BACKEND = 'django.core.mail.backends.console.EmailBackend'
 
-# Sendgrid Email Settings - Using OSF credentials.
+# SendGrid Email Settings - Using OSF credentials.
 # Add settings references to local.py
 
 EMAIL_HOST = osf_settings.MAIL_SERVER
diff --git a/admin/base/settings/local-dist.py b/admin/base/settings/local-dist.py
index 2da039fd6d0..e69bdeae13e 100644
--- a/admin/base/settings/local-dist.py
+++ b/admin/base/settings/local-dist.py
@@ -1,3 +1,3 @@
 ## The default development email backend is the django console backend, as set in
 ## defaults.py. If you wish to enable sendgrid, uncomment the following line:
-# EMAIL_BACKEND = 'sendgrid_backend.SendgridBackend'
+# EMAIL_BACKEND = 'sendgrid_backend.SendGridBackend'
diff --git a/admin/base/utils.py b/admin/base/utils.py
index 3eca810182c..f0159204863 100644
--- a/admin/base/utils.py
+++ b/admin/base/utils.py
@@ -30,12 +30,12 @@ def reverse_qs(view, urlconf=None, args=None, kwargs=None, current_app=None, que
 
 
 def osf_staff_check(user):
-    return user.is_authenticated and user.is_staff
+    return user and user.is_authenticated and user.is_staff
 
 
 def get_subject_rules(subjects_selected):
     """
-    Take a list of subjects, and parse them into rules consistent with preprpint provider
+    Take a list of subjects, and parse them into rules consistent with preprint provider
     rules and subjects. A "rule" consists of a hierarchy of Subject _ids, and a boolean value
     describing if the rest of the descendants of the last subject in the list are included or not.
 
diff --git a/admin/collection_providers/urls.py b/admin/collection_providers/urls.py
index cfc1d37374b..556a821997e 100644
--- a/admin/collection_providers/urls.py
+++ b/admin/collection_providers/urls.py
@@ -9,7 +9,7 @@
     re_path(r'^import/$', views.ImportCollectionProvider.as_view(), name='import'),
     re_path(r'^(?P<collection_provider_id>[a-z0-9]+)/$', views.CollectionProviderDetail.as_view(), name='detail'),
     re_path(r'^(?P<collection_provider_id>[a-z0-9]+)/delete/$', views.DeleteCollectionProvider.as_view(), name='delete'),
-    re_path(r'^(?P<collection_provider_id>[a-z0-9]+)/export/$', views.ExportColectionProvider.as_view(), name='export'),
+    re_path(r'^(?P<collection_provider_id>[a-z0-9]+)/export/$', views.ExportCollectionProvider.as_view(), name='export'),
     re_path(r'^(?P<collection_provider_id>[a-z0-9]+)/import/$', views.ImportCollectionProvider.as_view(), name='import'),
     re_path(r'^(?P<collection_provider_id>[a-z0-9]+)/cannot_delete/$', views.CannotDeleteProvider.as_view(), name='cannot_delete'),
     re_path(r'^(?P<provider_id>[a-z0-9]+)/remove_admins_and_moderators/$', views.CollectionRemoveAdminsAndModerators.as_view(), name='remove_admins_and_moderators'),
diff --git a/admin/collection_providers/views.py b/admin/collection_providers/views.py
index ddc3e6e3f85..779f7b89c04 100644
--- a/admin/collection_providers/views.py
+++ b/admin/collection_providers/views.py
@@ -326,7 +326,7 @@ def get_context_data(self, **kwargs):
         return context
 
 
-class ExportColectionProvider(PermissionRequiredMixin, View):
+class ExportCollectionProvider(PermissionRequiredMixin, View):
     permission_required = 'osf.change_collectionprovider'
     raise_exception = True
 
@@ -366,7 +366,7 @@ def post(self, request, *args, **kwargs):
             try:
                 collection_provider = self.create_or_update_provider(cleaned_result)
             except exceptions.ValidationError:
-                messages.error(request, 'A Validation Error occured, this JSON is invalid or shares an id with an already existing provider.')
+                messages.error(request, 'A Validation Error occurred, this JSON is invalid or shares an id with an already existing provider.')
                 return redirect('collection_providers:create')
 
             return redirect('collection_providers:detail', collection_provider_id=collection_provider.id)
diff --git a/admin/comments/views.py b/admin/comments/views.py
index 74767956919..24adf0cb12a 100644
--- a/admin/comments/views.py
+++ b/admin/comments/views.py
@@ -47,7 +47,7 @@ def get_context_data(self, **kwargs):
 
 
 class UserCommentList(CommentList):
-    """ Allow authorized admin user to see the comments a user has had
+    """ Allow authorized admin user to see the comments that a user has had
      marked spam
     """
     template_name = 'comments/user.html'
diff --git a/admin/institutions/views.py b/admin/institutions/views.py
index a7b76bc9109..46e6a0a7745 100644
--- a/admin/institutions/views.py
+++ b/admin/institutions/views.py
@@ -223,7 +223,7 @@ def get_queryset(self):
     def get_context_data(self, **kwargs):
         institution = Institution.objects.get(id=self.kwargs['institution_id'])
         context = super().get_context_data(**kwargs)
-        admin_group = Group.objects.filter(name__startswith=f'institution_{institution._id}').first()
+        admin_group = Group.objects.filter(name=f'institution_{institution._id}_institutional_admins').first()
         context['institution'] = institution
         context['admins'] = admin_group.user_set.all()
         return context
@@ -246,7 +246,7 @@ def post(self, request, *args, **kwargs):
             messages.error(request, f'User for guid: {data["add-admins-form"][0]} could not be found')
             return redirect('institutions:list_and_add_admin', institution_id=institution.id)
 
-        admin_group = Group.objects.filter(name__startswith=f'institution_{institution._id}').first()
+        admin_group = Group.objects.filter(name=f'institution_{institution._id}_institutional_admins').first()
         admin_group.user_set.add(target_user)
 
         messages.success(request, f'The following admin was successfully added: {target_user.fullname} ({target_user.username})')
@@ -263,7 +263,7 @@ def post(self, request, *args, **kwargs):
         to_be_removed = list(data.keys())
         removed_admins = [admin.replace('Admin-', '') for admin in to_be_removed if 'Admin-' in admin]
         admins = OSFUser.objects.filter(id__in=removed_admins)
-        admin_group = Group.objects.filter(name__startswith=f'institution_{institution._id}').first()
+        admin_group = Group.objects.filter(name=f'institution_{institution._id}_institutional_admins').first()
         admin_group.user_set.remove(*admins)
 
         if admins:
@@ -362,7 +362,7 @@ def form_valid(self, form):
         if not osf_user:
             raise Http404(f'OSF user with id "{user_id}" not found. Please double check.')
 
-        group = Group.objects.filter(name__startswith=f'institution_{target_institution._id}').first()
+        group = Group.objects.filter(name=f'institution_{target_institution._id}_institutional_admins').first()
 
         group.user_set.add(osf_user)
         group.save()
diff --git a/admin/nodes/forms.py b/admin/nodes/forms.py
new file mode 100644
index 00000000000..ea2383babe4
--- /dev/null
+++ b/admin/nodes/forms.py
@@ -0,0 +1,11 @@
+from django import forms
+
+
+class AddSystemTagForm(forms.Form):
+    system_tag_to_add = forms.CharField(label='system_tag_to_add', min_length=1, max_length=1024, required=True)
+
+
+class RegistrationDateForm(forms.Form):
+    registered_date = forms.DateTimeField(
+        widget=forms.DateTimeInput(attrs={'class': 'form-control'}),
+    )
diff --git a/admin/nodes/templatetags/node_extras.py b/admin/nodes/templatetags/node_extras.py
index 4fb9606f22e..be53d2f7506 100644
--- a/admin/nodes/templatetags/node_extras.py
+++ b/admin/nodes/templatetags/node_extras.py
@@ -88,3 +88,8 @@ def get_spam_status(resource):
         return mark_safe('<span class="label label-danger">Spam</span>')
     elif resource.spam_status == SpamStatus.HAM:
         return mark_safe('<span class="label label-success">Ham</span>')
+
+
+@register.filter
+def get_class_name(resource):
+    return resource.__class__.__name__.lower()
diff --git a/admin/nodes/urls.py b/admin/nodes/urls.py
index 1d5f6e0bac9..ac31ec0dc9b 100644
--- a/admin/nodes/urls.py
+++ b/admin/nodes/urls.py
@@ -18,6 +18,7 @@
     re_path(r'^(?P<guid>[a-z0-9]+)/logs/$', views.AdminNodeLogView.as_view(), name='node-logs'),
     re_path(r'^(?P<guid>[a-z0-9]+)/schema_responses/$', views.AdminNodeSchemaResponseView.as_view(),
         name='schema-responses'),
+    re_path(r'^(?P<guid>[a-z0-9]+)/update_registration_date/$', views.RegistrationUpdateDateView.as_view(), name='update-registration-date'),
     re_path(r'^(?P<guid>[a-z0-9]+)/update_embargo/$', views.RegistrationUpdateEmbargoView.as_view(), name='update-embargo'),
     re_path(r'^(?P<guid>[a-z0-9]+)/change_provider/$', views.RegistrationChangeProviderView.as_view(), name='change-provider'),
     re_path(r'^(?P<guid>[a-z0-9]+)/remove/$', views.NodeDeleteView.as_view(), name='remove'),
@@ -46,4 +47,7 @@
     re_path(r'^(?P<guid>[a-z0-9]+)/update_moderation_state/$', views.NodeUpdateModerationStateView.as_view(), name='node-update-mod-state'),
     re_path(r'^(?P<guid>[a-z0-9]+)/resync_datacite/$', views.NodeResyncDataCiteView.as_view(), name='resync-datacite'),
     re_path(r'^(?P<guid>[a-z0-9]+)/revert/$', views.NodeRevertToDraft.as_view(), name='revert-to-draft'),
+    re_path(r'^(?P<guid>[a-z0-9]+)/system_tags/add/$', views.NodeAddSystemTag.as_view(), name='add-system-tag'),
+    re_path(r'^(?P<guid>[a-z0-9]+)/system_tags/(?P<tag_id>[a-z0-9]+)/remove/$', views.NodeRemoveSystemTag.as_view(), name='remove-system-tag'),
+    re_path(r'^(?P<guid>[a-z0-9]+)/update_permissions/$', views.NodeUpdatePermissionsView.as_view(), name='update-permissions'),
 ]
diff --git a/admin/nodes/views.py b/admin/nodes/views.py
index 74321c8f908..83a1ae98a16 100644
--- a/admin/nodes/views.py
+++ b/admin/nodes/views.py
@@ -22,6 +22,7 @@
 from admin.base.views import GuidView
 from admin.base.forms import GuidForm
 from admin.notifications.views import detect_duplicate_notifications, delete_selected_notifications
+from admin.nodes.forms import AddSystemTagForm, RegistrationDateForm
 
 from api.share.utils import update_share
 from api.caching.tasks import update_storage_usage_cache
@@ -47,7 +48,7 @@
     REINDEX_SHARE,
     REINDEX_ELASTIC,
 )
-from osf.utils.permissions import ADMIN
+from osf.utils.permissions import ADMIN, API_CONTRIBUTOR_PERMISSIONS
 
 from scripts.approve_registrations import approve_past_pendings
 
@@ -89,6 +90,36 @@ def get_success_url(self):
         return reverse('nodes:node', kwargs={'guid': self.kwargs['guid']})
 
 
+class RegistrationUpdateDateView(NodeMixin, View):
+    permission_required = 'osf.change_node'
+    raise_exception = True
+
+    def post(self, request, *args, **kwargs):
+        node = self.get_object()
+        form = RegistrationDateForm(request.POST)
+        if form.is_valid():
+            last_date = node.registered_date
+            new_date = form.cleaned_data['registered_date']
+            node.registered_date = new_date
+            node.created = new_date
+            node.save()
+
+            node.add_log(
+                action=NodeLog.REGISTRATION_DATE_UPDATED,
+                auth=request,
+                params={
+                    'last_date': str(last_date),
+                    'new_date': str(new_date)
+                },
+                log_date=timezone.now(),
+                should_hide=False,
+            )
+            messages.success(request, 'Registration date updated successfully.')
+        else:
+            messages.error(request, 'Please enter a valid date.')
+        return redirect(self.get_success_url())
+
+
 class NodeView(NodeMixin, GuidView):
     """ Allows authorized users to view node info.
     """
@@ -101,6 +132,9 @@ def get_context_data(self, **kwargs):
         node = self.get_object()
 
         detailed_duplicates = detect_duplicate_notifications(node_id=node.id)
+        if isinstance(node, Registration):
+            context['registration_date_form'] = RegistrationDateForm(initial={'registered_date': node.registered_date})
+
         children = node.get_nodes(is_node_link=False)
         # Annotate guid because django templates prohibit accessing attributes that start with underscores
         children = AbstractNode.objects.filter(
@@ -110,12 +144,17 @@ def get_context_data(self, **kwargs):
             'SPAM_STATUS': SpamStatus,
             'STORAGE_LIMITS': settings.StorageLimits,
             'node': node,
+            # to edit contributors we should have guid as django prohibits _id usage as it starts with an underscore
+            'annotated_contributors': node.contributor_set.prefetch_related('user__guids').annotate(guid=F('user__guids___id')),
             'children': children,
+            'permissions': API_CONTRIBUTOR_PERMISSIONS,
+            'has_update_permission': self.request.user.has_perm('osf.change_node'),
             'duplicates': detailed_duplicates
         })
 
         return context
 
+
 class NodeRemoveNotificationView(View):
     def post(self, request, *args, **kwargs):
         selected_ids = request.POST.getlist('selected_notifications')
@@ -197,6 +236,76 @@ def add_contributor_removed_log(self, node, user):
         ).save()
 
 
+class NodeUpdatePermissionsView(NodeMixin, View):
+    permission_required = ('osf.view_node', 'osf.change_node')
+    raise_exception = True
+    redirect_view = NodeRemoveContributorView
+
+    def post(self, request, *args, **kwargs):
+        data = dict(request.POST)
+        contributor_id_to_remove = data.get('remove-user')
+        resource = self.get_object()
+
+        if contributor_id_to_remove:
+            contributor_id = contributor_id_to_remove[0]
+            # html renders form into form incorrectly,
+            # so this view handles contributors deletion and permissions update
+            return self.redirect_view(
+                request=request,
+                kwargs={'guid': resource.guid, 'user_id': contributor_id}
+            ).post(request, user_id=contributor_id)
+
+        new_emails_to_add = data.get('new-emails', [])
+        new_permissions_to_add = data.get('new-permissions', [])
+
+        new_permission_indexes_to_remove = []
+        for email, permission in zip(new_emails_to_add, new_permissions_to_add):
+            contributor_user = OSFUser.objects.filter(emails__address=email.lower()).first()
+            if not contributor_user:
+                new_permission_indexes_to_remove.append(new_emails_to_add.index(email))
+                messages.error(self.request, f'Email {email} is not registered in OSF.')
+                continue
+            elif resource.is_contributor(contributor_user):
+                new_permission_indexes_to_remove.append(new_emails_to_add.index(email))
+                messages.error(self.request, f'User with email {email} is already a contributor.')
+                continue
+
+            resource.add_contributor_registered_or_not(
+                auth=request,
+                user_id=contributor_user._id,
+                permissions=permission,
+                save=True
+            )
+            messages.success(self.request, f'User with email {email} was successfully added.')
+
+        # should remove permissions of invalid emails because
+        # admin can make all existing contributors non admins
+        # and enter an invalid email with the only admin permission
+        for permission_index in new_permission_indexes_to_remove:
+            new_permissions_to_add.pop(permission_index)
+
+        updated_permissions = data.get('updated-permissions', [])
+        all_permissions = updated_permissions + new_permissions_to_add
+        has_admin = list(filter(lambda permission: ADMIN in permission, all_permissions))
+        if not has_admin:
+            messages.error(self.request, 'Must be at least one admin on this node.')
+            return redirect(self.get_success_url())
+
+        for contributor_permission in updated_permissions:
+            guid, permission = contributor_permission.split('-')
+            user = OSFUser.load(guid)
+            resource.update_contributor(
+                user,
+                permission,
+                resource.get_visible(user),
+                request,
+                save=True,
+                skip_permission=True
+            )
+
+        return redirect(self.get_success_url())
+
+
 class NodeDeleteView(NodeMixin, View):
     """ Allows authorized users to mark nodes as deleted.
     """
@@ -317,7 +426,7 @@ def get_context_data(self, **kwargs):
 
 
 class StuckRegistrationListView(RegistrationListView):
-    """ Allows authorized users to view a list of registrations the have been archiving files by more then 24 hours.
+    """ Allows authorized users to view a list of registrations that have been archiving files for more than 24 hours.
     """
 
     def get_queryset(self):
@@ -812,3 +921,32 @@ def post(self, request, *args, **kwargs):
         registration = self.get_object()
         registration.to_draft()
         return redirect(self.get_success_url())
+
+
+class NodeAddSystemTag(NodeMixin, FormView):
+    """ Allows authorized users to add system tags to a node.
+    """
+    permission_required = 'osf.change_node'
+    raise_exception = True
+    form_class = AddSystemTagForm
+
+    def form_valid(self, form):
+        resource = self.get_object()
+        system_tag_to_add = form.cleaned_data['system_tag_to_add']
+        resource.add_system_tag(system_tag_to_add)
+        resource.save()
+
+        return super().form_valid(form)
+
+
+class NodeRemoveSystemTag(NodeMixin, View):
+    """ Allows authorized users to remove system tags from a node.
+    """
+    permission_required = 'osf.change_node'
+    raise_exception = True
+
+    def post(self, request, *args, **kwargs):
+        resource = self.get_object()
+        tag = resource.system_tags_objects.get(id=kwargs['tag_id'])
+        resource.remove_tag(tag.name, auth=request.user)
+        return redirect(self.get_success_url())
diff --git a/admin/preprint_providers/urls.py b/admin/preprint_providers/urls.py
index 120c6639ab7..a829cd3304a 100644
--- a/admin/preprint_providers/urls.py
+++ b/admin/preprint_providers/urls.py
@@ -18,6 +18,7 @@
     re_path(r'^(?P<preprint_provider_id>[a-z0-9]+)/delete/$', views.DeletePreprintProvider.as_view(), name='delete'),
     re_path(r'^(?P<preprint_provider_id>[a-z0-9]+)/export/$', views.ExportPreprintProvider.as_view(), name='export'),
     re_path(r'^(?P<preprint_provider_id>[a-z0-9]+)/share_source/$', views.ShareSourcePreprintProvider.as_view(), name='share_source'),
-    re_path(r'^(?P<preprint_provider_id>[a-z0-9]+)/register/$', views.PreprintProviderRegisterModeratorOrAdmin.as_view(), name='register_moderator_admin'),
     re_path(r'^(?P<preprint_provider_id>[a-z0-9]+)/edit/$', views.PreprintProviderChangeForm.as_view(), name='edit'),
+    re_path(r'^(?P<provider_id>[a-z0-9]+)/add_admin_or_moderator/$', views.PreprintAddAdminOrModerator.as_view(), name='add_admin_or_moderator'),
+    re_path(r'^(?P<provider_id>[a-z0-9]+)/remove_admins_and_moderators/$', views.PreprintRemoveAdminsAndModerators.as_view(), name='remove_admins_and_moderators'),
 ]
diff --git a/admin/preprint_providers/views.py b/admin/preprint_providers/views.py
index d841981fe84..10035702ea4 100644
--- a/admin/preprint_providers/views.py
+++ b/admin/preprint_providers/views.py
@@ -1,25 +1,23 @@
 import json
 
 
-from django.http import Http404
 from django.core import serializers
 from django.core.exceptions import ValidationError
-from django.urls import reverse_lazy, reverse
+from django.urls import reverse_lazy
 from django.http import HttpResponse, JsonResponse
 from django.views.generic import ListView, DetailView, View, CreateView, DeleteView, TemplateView, UpdateView
-from django.views.generic.edit import FormView
 from django.contrib import messages
 from django.contrib.auth.mixins import PermissionRequiredMixin
 from django.forms.models import model_to_dict
 from django.shortcuts import redirect, render
-from django.utils.functional import cached_property
 
 from admin.base import settings
 from admin.base.forms import ImportFileForm
-from admin.preprint_providers.forms import PreprintProviderForm, PreprintProviderCustomTaxonomyForm, PreprintProviderRegisterModeratorOrAdminForm
-from osf.models import PreprintProvider, Subject, OSFUser, RegistrationProvider, CollectionProvider
+from admin.preprint_providers.forms import PreprintProviderForm, PreprintProviderCustomTaxonomyForm
+from osf.models import PreprintProvider, Subject, RegistrationProvider, CollectionProvider
 from osf.models.provider import rules_to_subjects, WhitelistedSHAREPreprintProvider
 from website import settings as website_settings
+from admin.providers.views import AddAdminOrModerator, RemoveAdminsAndModerators
 
 FIELDS_TO_NOT_IMPORT_EXPORT = ['access_token', 'share_source', 'subjects_acceptable', 'primary_collection']
 
@@ -454,43 +452,17 @@ def get(self, request):
         return render(request, self.template_name, {'share_api_url': share_api_url, 'api_v2_url': api_v2_url})
 
 
-class PreprintProviderRegisterModeratorOrAdmin(PermissionRequiredMixin, FormView):
+class PreprintAddAdminOrModerator(AddAdminOrModerator):
     permission_required = 'osf.change_preprintprovider'
+    template_name = 'preprint_providers/edit_moderators.html'
+    provider_class = PreprintProvider
+    url_namespace = 'preprint_providers'
     raise_exception = True
-    template_name = 'preprint_providers/register_moderator_admin.html'
-    form_class = PreprintProviderRegisterModeratorOrAdminForm
-
-    @cached_property
-    def target_provider(self):
-        return PreprintProvider.objects.get(id=self.kwargs['preprint_provider_id'])
-
-    def get_form_kwargs(self):
-        kwargs = super().get_form_kwargs()
-        kwargs['provider_groups'] = self.target_provider.group_objects
-        return kwargs
-
-    def get_context_data(self, **kwargs):
-        context = super().get_context_data(**kwargs)
-        context['provider_name'] = self.target_provider.name
-        return context
-
-    def form_valid(self, form):
-        user_id = form.cleaned_data.get('user_id')
-        osf_user = OSFUser.load(user_id)
-
-        if not osf_user:
-            raise Http404(f'OSF user with id "{user_id}" not found. Please double check.')
-
-        if osf_user.has_groups(self.target_provider.group_names):
-            messages.error(self.request, f'User with guid: {user_id} is already a moderator or admin')
-            return super().form_invalid(form)
 
-        group = form.cleaned_data.get('group_perms')
-        self.target_provider.add_to_group(osf_user, group)
-        osf_user.save()
 
-        messages.success(self.request, f'Permissions update successful for OSF User {osf_user.username}!')
-        return super().form_valid(form)
-
-    def get_success_url(self):
-        return reverse('preprint_providers:register_moderator_admin', kwargs={'preprint_provider_id': self.kwargs['preprint_provider_id']})
+class PreprintRemoveAdminsAndModerators(RemoveAdminsAndModerators):
+    permission_required = 'osf.change_preprintprovider'
+    template_name = 'preprint_providers/edit_moderators.html'
+    provider_class = PreprintProvider
+    url_namespace = 'preprint_providers'
+    raise_exception = True
diff --git a/admin/preprints/urls.py b/admin/preprints/urls.py
index 4ab9bd33939..d6eabdd870c 100644
--- a/admin/preprints/urls.py
+++ b/admin/preprints/urls.py
@@ -20,6 +20,7 @@
     re_path(r'^(?P<guid>\w+)/make_public/$', views.PreprintMakePublic.as_view(), name='make-public'),
     re_path(r'^(?P<guid>\w+)/remove/$', views.PreprintDeleteView.as_view(), name='remove'),
     re_path(r'^(?P<guid>\w+)/restore/$', views.PreprintDeleteView.as_view(), name='restore'),
+    re_path(r'^(?P<guid>[\w_]+)/hard_delete/$', views.PreprintHardDeleteView.as_view(), name='hard-delete'),
     re_path(r'^(?P<guid>\w+)/confirm_unflag/$', views.PreprintConfirmUnflagView.as_view(), name='confirm-unflag'),
     re_path(r'^(?P<guid>\w+)/confirm_spam/$', views.PreprintConfirmSpamView.as_view(), name='confirm-spam'),
     re_path(r'^(?P<guid>\w+)/confirm_ham/$', views.PreprintConfirmHamView.as_view(), name='confirm-ham'),
@@ -29,4 +30,7 @@
     re_path(r'^(?P<guid>\w+)/resync_crossref/$', views.PreprintResyncCrossRefView.as_view(), name='resync-crossref'),
     re_path(r'^(?P<guid>\w+)/make_published/$', views.PreprintMakePublishedView.as_view(), name='make-published'),
     re_path(r'^(?P<guid>\w+)/unwithdraw/$', views.PreprintUnwithdrawView.as_view(), name='unwithdraw'),
+    re_path(r'^(?P<guid>\w+)/system_tags/add/$', views.PreprintAddSystemTag.as_view(), name='add-system-tag'),
+    re_path(r'^(?P<guid>\w+)/system_tags/(?P<tag_id>[a-z0-9]+)/remove/$', views.PreprintRemoveSystemTag.as_view(), name='remove-system-tag'),
+    re_path(r'^(?P<guid>\w+)/update_permissions/$', views.PreprintUpdatePermissionsView.as_view(), name='update-permissions'),
 ]
diff --git a/admin/preprints/views.py b/admin/preprints/views.py
index ef7d1860e76..cccc54fe1e9 100644
--- a/admin/preprints/views.py
+++ b/admin/preprints/views.py
@@ -15,8 +15,9 @@
 
 from admin.base.views import GuidView
 from admin.base.forms import GuidForm
-from admin.nodes.views import NodeRemoveContributorView
+from admin.nodes.views import NodeRemoveContributorView, NodeAddSystemTag, NodeRemoveSystemTag, NodeUpdatePermissionsView
 from admin.preprints.forms import ChangeProviderForm, MachineStateForm
+from admin.base.utils import osf_staff_check
 
 from api.share.utils import update_share
 from api.providers.workflows import Workflows
@@ -48,6 +49,7 @@
     UNFLAG_SPAM,
 )
 from osf.utils.workflows import DefaultStates
+from osf.utils.permissions import API_CONTRIBUTOR_PERMISSIONS
 from website import search
 from website.files.utils import copy_files
 from website.preprints.tasks import on_preprint_updated
@@ -75,9 +77,13 @@ def get_context_data(self, **kwargs):
         preprint = self.get_object()
         return super().get_context_data(**{
             'preprint': preprint,
+            # to edit contributors we should have guid as django prohibits _id usage as it starts with an underscore
+            'annotated_contributors': preprint.contributor_set.prefetch_related('user__guids').annotate(guid=F('user__guids___id')),
             'SPAM_STATUS': SpamStatus,
             'change_provider_form': ChangeProviderForm(instance=preprint),
             'change_machine_state_form': MachineStateForm(instance=preprint),
+            'permissions': API_CONTRIBUTOR_PERMISSIONS,
+            'has_update_permission': self.request.user.has_perm('osf.change_preprint')
         }, **kwargs)
 
 
@@ -272,6 +278,12 @@ def add_contributor_removed_log(self, preprint, user):
         ).save()
 
 
+class PreprintUpdatePermissionsView(PreprintMixin, NodeUpdatePermissionsView):
+    permission_required = ('osf.view_preprint', 'osf.change_preprint')
+    raise_exception = True
+    redirect_view = PreprintRemoveContributorView
+
+
 class PreprintDeleteView(PreprintMixin, View):
     """ Allows authorized users to mark preprints as deleted.
     """
@@ -315,6 +327,60 @@ def post(self, request, *args, **kwargs):
         return redirect(self.get_success_url())
 
 
+class PreprintHardDeleteView(PreprintMixin, View):
+    """Allows authorized users to permanently delete an initial-state preprint version.
+
+    This removes ONLY the broken draft preprint version (N+1) and its GuidVersionsThrough
+    version record, preserving all previous good versions (1 through N) so that a user
+    can initiate a new version again.
+
+    Based on create_version() and check_unfinished_or_unpublished_version() logic:
+    - Each version is a separate preprint instance
+    - The base Guid points to the latest published version
+    - We only delete the specific broken draft version, not the entire preprint lineage
+    """
+    permission_required = ('osf.delete_preprint',)
+
+    def post(self, request, *args, **kwargs):
+        if not osf_staff_check(request.user):
+            messages.error(request, 'Only staff can perform hard deletes.')
+            return redirect(self.get_success_url())
+
+        preprint = self.get_object()
+
+        if preprint.machine_state != DefaultStates.INITIAL.value:
+            messages.error(request, f'Only initial-state drafts can be hard deleted. Current state: {preprint.machine_state}')
+            return redirect(self.get_success_url())
+
+        try:
+            with transaction.atomic():
+                guid_version = preprint.versioned_guids.first()
+                if not guid_version:
+                    messages.error(request, 'No version record found for this draft preprint')
+                    return redirect('preprints:search')
+
+                version_number = guid_version.version
+                base_guid_obj = guid_version.guid
+
+                previous_version = base_guid_obj.versions.filter(
+                    version__lt=version_number,
+                    is_rejected=False
+                ).order_by('-version').first()
+                if previous_version:
+                    base_guid_obj.referent = previous_version.referent
+                    base_guid_obj.object_id = previous_version.object_id
+                    base_guid_obj.content_type = previous_version.content_type
+                    base_guid_obj.save()
+
+                guid_version.delete()
+                preprint.delete()
+
+            messages.success(request, f'Successfully deleted draft version {version_number}. Previous versions preserved.')
+            return redirect('preprints:search')
+        except Exception as exc:
+            messages.error(request, f'Failed to hard delete draft preprint: {str(exc)}')
+            return redirect(self.get_success_url())
+
 class PreprintWithdrawalRequestList(PermissionRequiredMixin, ListView):
     """ Allows authorized users to view list of withdraw requests for preprints and approve or reject the submitted
     preprint withdraw requests.
@@ -677,3 +743,15 @@ def post(self, request, *args, **kwargs):
 
             preprint.save()
         return redirect(self.get_success_url())
+
+
+class PreprintAddSystemTag(PreprintMixin, NodeAddSystemTag):
+    """ Allows authorized users to add system tags to a preprint.
+    """
+    permission_required = 'osf.change_preprint'
+
+
+class PreprintRemoveSystemTag(PreprintMixin, NodeRemoveSystemTag):
+    """ Allows authorized users to remove system tags from a preprint.
+    """
+    permission_required = 'osf.change_preprint'
diff --git a/admin/static/js/metrics/metrics.es6.js b/admin/static/js/metrics/metrics.es6.js
index 10d6281646a..9d0807e6d0d 100644
--- a/admin/static/js/metrics/metrics.es6.js
+++ b/admin/static/js/metrics/metrics.es6.js
@@ -885,11 +885,11 @@ var InstitutionMetrics = function() {
     });
     renderMetric("#total-institutional-users", "metric", institutional_user_count, defaultHeight);
 
-    // Total Instutional Users / Total OSF Users
+    // Total Institutional Users / Total OSF Users
     renderCalculationBetweenTwoQueries(institutional_user_count, activeUsersQuery,
                                        "#percentage-institutional-users", null, 'percentage');
 
-    // Insitutional Nodes!
+    // Institutional Nodes!
     var yesterdaysInstUserCount = new MetricParams({
         eventCollection: "institution_summary",
         timeframe: "previous_1_day",
diff --git a/admin/static/js/nodes/update_embargo.js b/admin/static/js/nodes/update_embargo.js
index 773ff084630..483e5406df2 100644
--- a/admin/static/js/nodes/update_embargo.js
+++ b/admin/static/js/nodes/update_embargo.js
@@ -16,7 +16,7 @@ $(document).ready(function() {
             type: "post",
             data: $("#embargo-update-form").serialize(),
         }).success(function (response) {
-            // reload page only after successfull response
+            // reload page only after successful response
             // so errors can be displayed in case of fail
             location.reload();
         }).fail(function (jqXHR, textStatus, error) {
diff --git a/admin/templates/collection_providers/update_collection_provider_form.html b/admin/templates/collection_providers/update_collection_provider_form.html
index 3f70aea2eb5..f36cf45601d 100644
--- a/admin/templates/collection_providers/update_collection_provider_form.html
+++ b/admin/templates/collection_providers/update_collection_provider_form.html
@@ -123,7 +123,7 @@
         <div>
             <h4>Import from JSON</h4>
             <p>Choose a JSON file that has been previously exported from another Collection Provider detail page. This will
-                pre-populate the Collection Provider change form with those details.</p>
+                prepopulate the Collection Provider change form with those details.</p>
             {% if collection_provider %}
                 <form action = {% url 'collection_providers:import' collection_provider_id=collection_provider.id %} method="post" enctype="multipart/form-data" >
             {% else %}
diff --git a/admin/templates/institutions/create.html b/admin/templates/institutions/create.html
index 7c7024d62fa..6604114a296 100644
--- a/admin/templates/institutions/create.html
+++ b/admin/templates/institutions/create.html
@@ -26,7 +26,7 @@ <h2>Create An Institution</h2>
                 <div>
                     <h4>Import from JSON</h4>
                     <p>Choose a JSON file that has been previously exported from another Institution detail page. This will
-                        pre-populate the Institution change form with those details.</p>
+                        prepopulate the Institution change form with those details.</p>
                     <form id="import-form" action = {% url 'institutions:import' %} method="post" enctype="multipart/form-data">
                         {% csrf_token %}
                         {{ import_form.as_p }}
diff --git a/admin/templates/institutions/detail.html b/admin/templates/institutions/detail.html
index 47315d8e8d7..2ce1ad20a03 100644
--- a/admin/templates/institutions/detail.html
+++ b/admin/templates/institutions/detail.html
@@ -24,12 +24,15 @@
                 <a class="btn btn-danger" href={% url 'institutions:delete' institution.id %}>Delete institution</a>
                 {%  endif %}
 				{% if perms.osf.change_institution %}
-					{% if institution.deactivated is None %}
-					<a class="btn btn-danger" href={% url 'institutions:deactivate' institution.id %}>Deactivate institution</a>
-					{% else %}
-					<a class="btn btn-danger" href={% url 'institutions:reactivate' institution.id %}>Reactivate institution</a>
-					{% endif %}
+                {% if institution.deactivated is None %}
+                <a class="btn btn-danger" href={% url 'institutions:deactivate' institution.id %}>Deactivate institution</a>
+                {% else %}
+                <a class="btn btn-danger" href={% url 'institutions:reactivate' institution.id %}>Reactivate institution</a>
+                {% endif %}
 				{% endif %}
+                {% if perms.osf.change_institution %}
+                <a class="btn btn-primary" href={% url 'institutions:list_and_add_admin' institution.id %}>Manage Admins</a>
+                {% endif %}
             </div>
         </div>
 
@@ -64,12 +67,6 @@ <h4>Banner:</h4>
                     <button id="show-modify-form" class="btn btn-link" type="button">
                         Modify Institution
                     </button>
-                    <div class="col-md-12">
-                        <a class="btn btn-link" href={% url 'institutions:register_metrics_admin' institution.id %}>Create Moderator/Admin</a>
-                    </div>
-                    <div class="col-md-12">
-                        <a class="btn btn-link" href={% url 'institutions:list_and_add_admin' institution.id %}>Contributors list</a>
-                    </div>
                 {% endif %}
             </div>
         </div>
@@ -98,7 +95,7 @@ <h4>Banner:</h4>
                 <div>
                     <h4>Import from JSON</h4>
                     <p>Choose a JSON file that has been previously exported from another Institution detail page. This will
-                    pre-populate the Institution change form with those details.</p>
+                    prepopulate the Institution change form with those details.</p>
                     <form id="import-form" action = {% url 'institutions:import' %} method="post" enctype="multipart/form-data">
                         {% csrf_token %}
                         {{ import_form.as_p }}
diff --git a/admin/templates/internet_archive/internet_archive.html b/admin/templates/internet_archive/internet_archive.html
index 0bb8033d688..113124bcd9d 100644
--- a/admin/templates/internet_archive/internet_archive.html
+++ b/admin/templates/internet_archive/internet_archive.html
@@ -63,7 +63,7 @@ <h4>Make <b>Provider</b> collections/subcollections</h4>
                         All these provider based collections are themselves subcollections of our "root collection" ({{ ia_collection }})
                         The <i>root collection</i> exists to separate our staging, local and production environments. <b>In order
                         to create/update the provider collection click Create/Update Provider SubCollections</b>
-                        The root collections must be created by a archive.org admin.
+                        The root collections must be created by an archive.org admin.
                     </li>
                     <li>
                         <h4>Archive backlogged registrations</h4>
@@ -76,9 +76,9 @@ <h4>Archive backlogged registrations</h4>
                     </li>
                     <li>
                         <h4>Monitor syncing</h4>
-                        Once an registration is archived the editable metadata should be synced automatically, but
-                        with so many registrations there's still a possibility a registration will become
-                        desyncronized due to a connection outage or glitch, so <b>there's tools to sync metadata or
+                        Once a registration is archived the editable metadata should be synced automatically, but
+                        with so many registrations there's still the possibility that a registration will become
+                        desynchronized due to a connection outage or glitch, so <b>there's tools to sync metadata or
                         check it for accuracy</b>
                     </li>
                 </ol>
diff --git a/admin/templates/management/commands.html b/admin/templates/management/commands.html
index 96fedb49307..c596e876b1c 100644
--- a/admin/templates/management/commands.html
+++ b/admin/templates/management/commands.html
@@ -27,7 +27,7 @@ <h4> <u>Update Waffle Flags and Switches </u>
             <h4> <u>Update Registration Schemas and Schema Blocks </u>
             </h4>
             <ul>
-                Use this management command to update the schemas and schma blocks
+                Use this management command to update the schemas and schema blocks
                 for Registrations to match values in website/project/metadata
                 <br>
                 <form method="post"
diff --git a/admin/templates/nodes/add_system_tags.html b/admin/templates/nodes/add_system_tags.html
new file mode 100644
index 00000000000..e8deb10a9c1
--- /dev/null
+++ b/admin/templates/nodes/add_system_tags.html
@@ -0,0 +1,59 @@
+{% load node_extras %}
+<tr>
+    <td>System tags</td>
+    <td>
+        <div style="display: flex; justify-content: start;">
+            {% for system_tag in resource.system_tags_objects %}
+                {% if resource|get_class_name == 'node' or resource|get_class_name == 'registration' %}
+                    <form method="post" action="{% url 'nodes:remove-system-tag' guid=resource.guid tag_id=system_tag.id %}">
+                {% elif resource|get_class_name == 'preprint' %}
+                    <form method="post" action="{% url 'preprints:remove-system-tag' guid=resource.guid tag_id=system_tag.id %}">
+                {% else %}
+                    <form method="post" action="{% url 'users:remove-system-tag' guid=resource.guid tag_id=system_tag.id %}">
+                {% endif %}
+                    <div>
+                        {% csrf_token %}
+                        <div class="modal-footer">
+                            <span>{{ system_tag.name }}</span>
+                            <input class="btn btn-danger" type="submit" value="Remove" />
+                        </div>
+                    </div>
+                </form>
+            {% endfor %}
+        </div>
+        <br>
+        <a class="btn btn-default" data-toggle="modal" data-target="#systemTagModal">
+            Add system tag
+         </a>
+         <div class="modal" id="systemTagModal">
+             <div class="modal-dialog">
+                 <div class="modal-content">
+                    {% if resource|get_class_name == 'node' or resource|get_class_name == 'registration' %}
+                        <form class="well" method="post" action="{% url 'nodes:add-system-tag' guid=resource.guid %}">
+                    {% elif resource|get_class_name == 'preprint' %}
+                        <form class="well" method="post" action="{% url 'preprints:add-system-tag' guid=resource.guid %}">
+                    {% else %}
+                        <form class="well" method="post" action="{% url 'users:add-system-tag' guid=resource.guid %}">
+                    {% endif%}
+                        <div class="modal-header">
+                            <button type="button" class="close" data-dismiss="modal">x</button>
+                            <h3>Add a system tag to this resource</h3>
+                        </div>
+                        <div class="modal-body">
+                            {% csrf_token %}
+                            <input placeholder="Enter system tag" name="system_tag_to_add">
+                        </div>
+                        <div class="modal-footer">
+                            <input class="btn btn-danger" type="submit" value="Confirm" />
+                            <button type="button" class="btn btn-default"
+                                    data-dismiss="modal">
+                                Cancel
+                            </button>
+                        </div>
+                    </form>
+                 </div>
+             </div>
+         </div>
+    </td>
+</tr>
+
diff --git a/admin/templates/nodes/contributors.html b/admin/templates/nodes/contributors.html
index 945e0bf7578..48a30fe98a2 100644
--- a/admin/templates/nodes/contributors.html
+++ b/admin/templates/nodes/contributors.html
@@ -9,11 +9,7 @@
                     <tr>
                         <td>Email</td>
                         <td>Name</td>
-                        <td>Permissions</td>
-                        <td>Actions</td>
-                        {%  if perms.osf.change_node %}
-                            <td></td>
-                        {% endif %}
+                        <td>Permission</td>
                     </tr>
                 </thead>
                 <tbody>
@@ -26,37 +22,11 @@
                             </td>
                             <td>{{ user.fullname }}</td>
                             <td>{% get_permissions user node %}</td>
-                            {%  if perms.osf.change_node %}
-                                <td>
-                                    <a data-toggle="modal" data-target="#{{ user.id }}Modal" class="btn btn-danger">Remove</a>
-                                    <div class="modal" id="{{ user.id }}Modal">
-                                        <div class="modal-dialog">
-                                            <div class="modal-content">
-                                                <form class="well" method="post" action="{% url 'nodes:remove-user'  guid=node.guid user_id=user.id  %}">
-                                                    <div class="modal-header">
-                                                        <button type="button" class="close" data-dismiss="modal">x</button>
-                                                        <h3>Removing contributor: {{ user.username }}</h3>
-                                                    </div>
-                                                    <div class="modal-body">
-                                                        User will be removed. Currently only an admin on this node type will be able to add them back.
-                                                        {% csrf_token %}
-                                                    </div>
-                                                    <div class="modal-footer">
-                                                        <input class="btn btn-danger" type="submit" value="Confirm" />
-                                                        <button type="button" class="btn btn-default" data-dismiss="modal">
-                                                            Cancel
-                                                        </button>
-                                                    </div>
-                                                </form>
-                                            </div>
-                                        </div>
-                                    </div>
-                                </td>
-                            {% endif %}
                         </tr>
                     {% endfor %}
                 </tbody>
             </table>
+            {% include 'nodes/edit_contributors.html' with contributors=annotated_contributors resource=node %}
         </div>
     </td>
 </tr>
\ No newline at end of file
diff --git a/admin/templates/nodes/edit_contributors.html b/admin/templates/nodes/edit_contributors.html
new file mode 100644
index 00000000000..f976e65aed9
--- /dev/null
+++ b/admin/templates/nodes/edit_contributors.html
@@ -0,0 +1,137 @@
+<a data-toggle="modal" data-target="#editContributors" class="btn btn-info">
+    Edit Contributors
+</a>
+<div class="modal" id="editContributors" style="width: 100%;">
+    <div class="modal-dialog" style="width: 60vw; margin: 50px 20vw;">
+        <div class="modal-content">
+            <div class="modal-header">
+                <button type="button" class="close" onclick="resetModal()" data-dismiss="modal">x</button>
+                <h3>Edit Contributors</h3>
+            </div>
+            {% if resource.type == 'osf.node' or resource.type == 'osf.registration' %}
+                <form action="{% url 'nodes:update-permissions' guid=resource.guid %}" method="post" id="contributors-form">
+            {% else %}
+                <form action="{% url 'preprints:update-permissions' guid=resource.guid %}" method="post" id="contributors-form">
+            {% endif %}
+                {% csrf_token %}
+                <table class="table table-bordered table-hover" id="contributors-table">
+                    <thead>
+                        <tr>
+                            <td>Email</td>
+                            <td>Name</td>
+                            <td>Permission</td>
+                            <td></td>
+                        </tr>
+                    </thead>
+                    <tbody>
+                        {% for contributor in contributors %}
+                            <tr>
+                                <td><a href="{% url 'users:user' guid=contributor.guid %}">{{ contributor.user.email }}</a></td>
+                                <td>{{ contributor.user.fullname }}</td>
+                                <td style="padding: 10px; margin: 0; text-align: center; align-items: center; display: grid;">
+                                    <select name="updated-permissions">
+                                        {% for permission in permissions %}
+                                            {% if contributor.permission == permission %}
+                                                <option value="{{ contributor.guid }}-{{ permission }}" selected>{{ permission }}</option>
+                                            {% else %}
+                                                <option value="{{ contributor.guid }}-{{ permission }}">{{ permission }}</option>
+                                            {% endif %}
+                                        {% endfor %}
+                                    </select>
+                                </td>
+                                {% if has_update_permission %}
+                                    <td style="text-align: center;">
+                                        <a data-toggle="modal" data-target="#{{ contributor.user.id }}Modal" class="btn btn-danger">Remove</a>
+                                        <div class="modal" id="{{ contributor.user.id }}Modal">
+                                            <div class="modal-dialog">
+                                                <div class="modal-content">
+                                                    <div class="modal-header">
+                                                        <button type="button" class="close" data-dismiss="modal">x</button>
+                                                        <h3>Removing contributor: {{ contributor.user.username }}</h3>
+                                                    </div>
+                                                    <div class="modal-body">
+                                                        User will be removed. Currently only an admin on this node type will be able to add them back.
+                                                    </div>
+                                                    <div class="modal-footer">
+                                                        <button type="submit" onclick="resetModal()" name="remove-user" value="{{ contributor.user.id }}" class="btn btn-danger">Delete</button>
+                                                        <button type="button" onclick="resetModal()" name="{{ contributor.user.id }}" class="btn btn-default" data-dismiss="modal">
+                                                            Cancel
+                                                        </button>
+                                                    </div>
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </td>
+                                {% endif %}
+                            </tr>
+                        {% endfor %}
+                    </tbody>
+                </table>
+                <div class="modal-footer" style="display: grid; grid-template: 'left right'; grid-template-columns: 1fr 5fr;">
+                    <div class="left-button" style="grid-area: left; display: flex">
+                        <input name="add-contributor" class="btn btn-success" onclick="addRow()" type="button" value="Add Contributor" />
+                    </div>
+                    <div class="right-buttons" style="grid-area: right">
+                        <button type="button" class="btn btn-default" onclick="resetModal()" data-dismiss="modal">
+                            Cancel
+                        </button>
+                        <input class="btn btn-success" type="submit" value="Save" />
+                    </div>
+                </div>
+            </form>
+        </div>
+    </div>
+</div>
+
+<script>
+    let new_rows_counter = 0;
+
+    function addRow() {
+        const tableBody = document.getElementById("contributors-table").getElementsByTagName('tbody')[0];
+        const newRow = document.createElement("tr");
+        newRow.id = `new-contributor-row-${new_rows_counter}`;
+        new_rows_counter += 1;
+        const cell1 = document.createElement("td");
+        const cell2 = document.createElement("td");
+        const cell3 = document.createElement("td");
+        const cell4 = document.createElement("td");
+
+        cell1.innerHTML = '<input type="email" required name="new-emails" placeholder="Add email">'
+        cell3.innerHTML = `
+        <select name="new-permissions">
+            {% for permission in permissions %}
+                {% if contributor.permission == permission %}
+                    <option value="{{ permission }}" selected>{{ permission }}</option>
+                {% else %}
+                    <option value="{{ permission }}">{{ permission }}</option>
+                {% endif %}
+            {% endfor %}
+        </select>
+        `;
+        cell3.style="padding: 10px; margin: 0; text-align: center; align-items: center; display: grid;"
+        cell4.innerHTML = `<button type="button" class="btn btn-danger" onclick="removeRow('${newRow.id}')" data-dismiss="modal">Remove row</button>`;
+        cell4.style = 'text-align: center;'
+
+        newRow.appendChild(cell1);
+        newRow.appendChild(cell2);
+        newRow.appendChild(cell3);
+        newRow.appendChild(cell4)
+
+        tableBody.appendChild(newRow);
+    }
+
+    function removeRow(id) {
+        try {
+            document.getElementById(id).remove();
+        } catch {};
+    }
+
+    function resetModal() {
+        const table = document.getElementById("contributors-form");
+        table.reset();
+        for (let i = 0; i < new_rows_counter; i++) {
+            removeRow(`new-contributor-row-${i}`);
+        }
+        new_rows_counter = 0;
+    }
+</script>
\ No newline at end of file
diff --git a/admin/templates/nodes/node.html b/admin/templates/nodes/node.html
index caf8bd5ebc6..1c791ce2b76 100644
--- a/admin/templates/nodes/node.html
+++ b/admin/templates/nodes/node.html
@@ -42,6 +42,28 @@ <h2>{{ node.type|cut:'osf.'|title }}: <b>{{ node.title }}</b> <a href="{{ node.a
                         <td>Guid</td>
                         <td>{{ node.guid }}</td>
                     </tr>
+                    <tr>
+                        <td>Created</td>
+                        <td>{{ node.created }}</td>
+                    </tr>
+                    {% if node.is_registration %}
+                    <tr>
+                        <td>Registered Date</td>
+                        <td>{{ node.registered_date }}</td>
+                    </tr>
+                        {% if registration_date_form %}
+                        <tr>
+                            <td></td>
+                            <td>
+                                <form method="post" action="{% url 'nodes:update-registration-date' guid=node.guid %}">
+                                    {% csrf_token %}
+                                    {{ registration_date_form.as_p }}
+                                    <button type="submit" class="btn btn-primary">Update Date</button>
+                                </form>
+                            </td>
+                        </tr>
+                        {% endif %}
+                    {% endif %}
                     <tr>
                         <td>Title</td>
                         <td>{{ node.title }}</td>
@@ -97,6 +119,7 @@ <h2>{{ node.type|cut:'osf.'|title }}: <b>{{ node.title }}</b> <a href="{{ node.a
                         <td>IA url</td>
                         <td>{{ node.ia_url }}</td>
                     </tr>
+                    {% include "nodes/add_system_tags.html" with resource=node %}
                     {% include "nodes/contributors.html" with node=node %}
                     {% include "nodes/spam_status.html" with resource=node %}
                     {% include "nodes/draft_registrations.html" with draft_registrations=node.draft_registrations.all %}
diff --git a/admin/templates/preprint_providers/create_or_update_preprint_provider_form.html b/admin/templates/preprint_providers/create_or_update_preprint_provider_form.html
index 74fd9c3cbd1..7ce7ec1024a 100644
--- a/admin/templates/preprint_providers/create_or_update_preprint_provider_form.html
+++ b/admin/templates/preprint_providers/create_or_update_preprint_provider_form.html
@@ -134,7 +134,7 @@
             <div>
                 <h4>Import from JSON</h4>
                 <p>Choose a JSON file that has been previously exported from another Preprint Provider detail page. This will
-                    pre-populate the Preprint Provider change form with those details.</p>
+                    prepopulate the Preprint Provider change form with those details.</p>
                 {% if preprint_provider %}
                     <form action = {% url 'preprint_providers:import' preprint_provider_id=preprint_provider.id %} method="post" enctype="multipart/form-data" >
                 {% else %}
diff --git a/admin/templates/preprint_providers/detail.html b/admin/templates/preprint_providers/detail.html
index 109dc50bd0b..b945829699b 100644
--- a/admin/templates/preprint_providers/detail.html
+++ b/admin/templates/preprint_providers/detail.html
@@ -36,7 +36,7 @@
                     <a class="btn btn-primary" href={% url 'preprint_providers:share_source' preprint_provider.id %}>Setup Share Source</a>
                 {% endif %}
                 {% if perms.osf.change_preprintprovider %}
-                    <a class="btn btn-primary" href={% url 'preprint_providers:register_moderator_admin' preprint_provider.id %}>Register Moderator/Admin</a>
+                    <a class="btn btn-primary" href={% url 'preprint_providers:add_admin_or_moderator' preprint_provider.id %}>Manage Admins and Moderators</a>
                     <a class="btn btn-primary" href={% url 'preprint_providers:edit' preprint_provider.id %}>Modify Preprint Provider</a>
                 {% if show_taxonomies %}
                     <a class="btn btn-primary" href={% url 'preprint_providers:process_custom_taxonomy' preprint_provider.id %}>Modify Custom Taxonomy</a>
diff --git a/admin/templates/preprint_providers/edit_moderators.html b/admin/templates/preprint_providers/edit_moderators.html
new file mode 100644
index 00000000000..dc2901907eb
--- /dev/null
+++ b/admin/templates/preprint_providers/edit_moderators.html
@@ -0,0 +1,63 @@
+{% extends "base.html" %}
+{% load static %}
+{% load render_bundle from webpack_loader %}
+{% block title %}
+    <title>Preprint Provider</title>
+{% endblock title %}
+{% block content %}
+    <div class="container-fluid">
+        <div class="row">
+            {% if messages %}
+            <ul>
+                {% for message in messages %}
+                <li{% if message.tags %} class="{{ message.tags }}"{% endif %}>{{ message }}</li>
+                {% endfor %}
+            </ul>
+            {% endif %}
+        </div>
+        <div class="row">
+            <div class="col-md-12 text-center">
+                <h2>{{ provider.name }}</h2>
+            </div>
+        </div>
+        <div class="row">
+            <div class="col-md-12">
+                <form id="add-moderators-form" action="{% url 'preprint_providers:add_admin_or_moderator' provider.id %}" method="post">
+                    {% csrf_token %}
+                    <label>Add moderator by guid: </label>
+                    <input type="text" name="add-moderators-form">
+                    <input type="submit" name="mod" value="Add Moderator" class="form-button btn btn-success">
+                    <input type="submit" name="admin" value="Add Admin" class="form-button btn btn-success">
+                </form>
+            </div>
+        </div>
+        <hr>
+        <div class="row">
+            <div class="col-md-12">
+                <form id="remove-moderators-form" action="{% url 'preprint_providers:remove_admins_and_moderators' provider.id %}" method="post">
+                    {% csrf_token %}
+                    <table class="table table-striped">
+                        <th></th>
+                        <th>Name</th>
+                        <th>Type</th>
+                        {% for moderator in moderators %}
+                            <tr>
+                                <td><input type='checkbox' name="Moderator-{{moderator.id}}"></td>
+                                <td>{{ moderator.fullname }} ({{moderator.username}})</td>
+                                <td>Moderator</td>
+                            </tr>
+                        {% endfor %}
+                        {% for admin in admins %}
+                            <tr>
+                                <td><input type='checkbox' name="Admin-{{admin.id}}"></td>
+                                <td>{{ admin.fullname }} ({{admin.username}})</td>
+                                <td>Admin</td>
+                            </tr>
+                        {% endfor %}
+                    </table>
+                    <input class="form-button btn btn-danger" type="submit" value="Remove Moderators/Admins" />
+                </form>
+            </div>
+        </div>
+    </div>
+{% endblock content %}
diff --git a/admin/templates/preprint_providers/enter_custom_taxonomy.html b/admin/templates/preprint_providers/enter_custom_taxonomy.html
index b303a58a8de..e319cfd254e 100644
--- a/admin/templates/preprint_providers/enter_custom_taxonomy.html
+++ b/admin/templates/preprint_providers/enter_custom_taxonomy.html
@@ -48,7 +48,7 @@ <h2>Custom Taxonomy</h2>
                 <p>To remove an entry, delete it from the text box in the Built Custom Taxonomy section. If deleting the last item in a list, be sure to also remove the
                     final comma.</p>
 
-                <p>Click <a role="button" data-toggle="modal" href="#exampleModal">here</a> to see an example of a full custom taxonomy and for more information about each field.</p>
+                    <p>See an <a role="button" data-toggle="modal" href="#exampleModal">example of a full custom taxonomy and more information about each field</a>.</p>
             </div>
             <form id="taxonomy-form" action="{% url 'preprint_providers:process_custom_taxonomy' preprint_provider_id %}" method="post">
                 {% csrf_token %}
@@ -213,7 +213,7 @@ <h4 class="modal-title" id="exampleModalLabel">Custom Taxonomy Example</h4>
                                     *Note*: if adding a new child of an existing bepress parent that hasn't already been included, you must also add a 'custom' parent with the same name that maps to the existing
                                     bepress subject. See JSON below for an example. This is only necessary because "Engineering" wasn't explicitly included.
                                 </li>
-                                <li>bepress: the existing subject that you would like to repalce with the subject listed in the custom name field.</li>
+                                <li>bepress: the existing subject that you would like to replace with the subject listed in the custom name field.</li>
                             </ul>
                         </li>
                         <li><b>merge</b>: The existing Bepress subjects you would like to "merge" together..
diff --git a/admin/templates/preprints/contributors.html b/admin/templates/preprints/contributors.html
index d225994f388..a3d8697a0c6 100644
--- a/admin/templates/preprints/contributors.html
+++ b/admin/templates/preprints/contributors.html
@@ -8,8 +8,7 @@
                 <tr>
                     <td>Email</td>
                     <td>Name</td>
-                    <td>Permissions</td>
-                    <td>Actions</td>
+                    <td>Permission</td>
                 </tr>
             </thead>
             <tbody>
@@ -22,36 +21,10 @@
                     </td>
                     <td>{{ user.fullname }}</td>
                     <td>{% get_permissions user preprint %}</td>
-                    {%  if perms.osf.change_preprint %}
-                        <td>
-                            <a data-toggle="modal" data-target="#{{ user.id }}Modal" class="btn btn-danger">Remove</a>
-                            <div class="modal" id="{{ user.id }}Modal">
-                                <div class="modal-dialog">
-                                    <div class="modal-content">
-                                        <form class="well" method="post" action="{% url 'preprints:remove-user'  guid=preprint.guid user_id=user.id  %}">
-                                            <div class="modal-header">
-                                                <button type="button" class="close" data-dismiss="modal">x</button>
-                                                <h3>Removing contributor: {{ user.username }}</h3>
-                                            </div>
-                                            <div class="modal-body">
-                                                User will be removed. Currently only an admin on this preprint type will be able to add them back.
-                                                {% csrf_token %}
-                                            </div>
-                                            <div class="modal-footer">
-                                                <input class="btn btn-danger" type="submit" value="Confirm" />
-                                                <button type="button" class="btn btn-default" data-dismiss="modal">
-                                                    Cancel
-                                                </button>
-                                            </div>
-                                        </form>
-                                    </div>
-                                </div>
-                            </div>
-                        </td>
-                    {% endif %}
                 </tr>
             {% endfor %}
             </tbody>
         </table>
+        {% include 'nodes/edit_contributors.html' with contributors=annotated_contributors resource=preprint %}
     </td>
 </tr>
\ No newline at end of file
diff --git a/admin/templates/preprints/hard_delete_preprint.html b/admin/templates/preprints/hard_delete_preprint.html
new file mode 100644
index 00000000000..1cd7af4ba24
--- /dev/null
+++ b/admin/templates/preprints/hard_delete_preprint.html
@@ -0,0 +1,32 @@
+{% if perms.osf.delete_preprint %}
+    {% if preprint.machine_state == 'initial' %}
+        <a data-toggle="modal" data-target="#hardDeleteModal" class="btn btn-danger">
+            Hard Delete Draft
+        </a>
+        <div class="modal" id="hardDeleteModal">
+            <div class="modal-dialog">
+                <div class="modal-content">
+                    <form class="well" method="post" action="{% url 'preprints:hard-delete' guid=preprint.guid %}">
+                        <div class="modal-header">
+                            <button type="button" class="close" data-dismiss="modal">x</button>
+                            <h3>Hard delete draft preprint? ({{ preprint.guid }})</h3>
+                        </div>
+                        <div class="modal-body">
+                            This action permanently removes this draft preprint version and cannot be undone.
+                            {% csrf_token %}
+                        </div>
+                        <div class="modal-footer">
+                            <input class="btn btn-warning" type="submit" value="Confirm" />
+                            <button type="button" class="btn btn-default"
+                                    data-dismiss="modal">
+                                Cancel
+                            </button>
+                        </div>
+                    </form>
+                </div>
+            </div>
+        </div>
+    {% endif %}
+{% endif %}
+
+
diff --git a/admin/templates/preprints/preprint.html b/admin/templates/preprints/preprint.html
index 719304d716f..d716b60aeb7 100644
--- a/admin/templates/preprints/preprint.html
+++ b/admin/templates/preprints/preprint.html
@@ -18,6 +18,7 @@
                        class="btn btn-primary">
                         <i class="fa fa-search"></i>
                     </a>
+                    {% include "preprints/hard_delete_preprint.html" with preprint=preprint %}
                     {% include "preprints/remove_preprint.html" with preprint=preprint %}
                     {% include "preprints/mark_spam.html" with preprint=preprint %}
                     {% include "preprints/reindex_preprint_share.html" with preprint=preprint %}
@@ -115,6 +116,7 @@ <h2>Preprint: <b>{{ preprint.title }}</b> <a href="{{ preprint.absolute_url }}">
                             </ul>
                         </td>
                     </tr>
+                    {% include "nodes/add_system_tags.html" with resource=preprint %}
                     {% include "preprints/contributors.html" with preprint=preprint %}
                     {% include "nodes/spam_status.html" with resource=preprint %}
                     {% include "preprints/withdraw_request.html" with preprint=preprint %}
diff --git a/admin/templates/registration_providers/enter_custom_taxonomy.html b/admin/templates/registration_providers/enter_custom_taxonomy.html
index 94683133a05..bf3cb1b2d48 100644
--- a/admin/templates/registration_providers/enter_custom_taxonomy.html
+++ b/admin/templates/registration_providers/enter_custom_taxonomy.html
@@ -13,7 +13,7 @@ <h2>Custom Taxonomy</h2>
             <p>To remove an entry, delete it from the text box in the Built Custom Taxonomy section. If deleting the last item in a list, be sure to also remove the
                 final comma.</p>
 
-            <p>Click <a role="button" data-toggle="modal" href="#exampleModal">here</a> to see an example of a full custom taxonomy and for more information about each field.</p>
+            <p>See an <a role="button" data-toggle="modal" href="#exampleModal">example of a full custom taxonomy and more information about each field</a>.</p>
         </div>
         <form id="taxonomy-form" action="{% url 'registration_providers:process_custom_taxonomy' %}" method="post">
             {% csrf_token %}
@@ -155,7 +155,7 @@ <h4 class="modal-title" id="exampleModalLabel">Custom Taxonomy Example</h4>
                                     *Note*: if adding a new child of an existing bepress parent that hasn't already been included, you must also add a 'custom' parent with the same name that maps to the existing
                                     bepress subject. See JSON below for an example. This is only necessary because "Engineering" wasn't explicitly included.
                                 </li>
-                                <li>bepress: the existing subject that you would like to repalce with the subject listed in the custom name field.</li>
+                                <li>bepress: the existing subject that you would like to replace with the subject listed in the custom name field.</li>
                             </ul>
                         </li>
                         <li><b>merge</b>: The existing Bepress subjects you would like to "merge" together..
diff --git a/admin/templates/registration_providers/update_registration_provider_form.html b/admin/templates/registration_providers/update_registration_provider_form.html
index 96b78cf2fea..52953e5e6e5 100644
--- a/admin/templates/registration_providers/update_registration_provider_form.html
+++ b/admin/templates/registration_providers/update_registration_provider_form.html
@@ -64,7 +64,7 @@
         <div>
             <h4>Import from JSON</h4>
             <p>Choose a JSON file that has been previously exported from another Registration Provider detail page. This will
-                pre-populate the Registration Provider change form with those details.</p>
+                prepopulate the Registration Provider change form with those details.</p>
             {% if registration_provider %}
                 <form action = {% url 'registration_providers:import' registration_provider_id=registration_provider.id %} method="post" enctype="multipart/form-data" >
             {% else %}
diff --git a/admin/templates/users/add_system_tags.html b/admin/templates/users/add_system_tags.html
deleted file mode 100644
index db685cb7e34..00000000000
--- a/admin/templates/users/add_system_tags.html
+++ /dev/null
@@ -1,35 +0,0 @@
-<tr>
-    <td>System tags</td>
-    <td>
-        {% for system_tag in user.system_tags %}
-            {{ system_tag }}{% if not forloop.last %}, {% endif %}
-        {% endfor %}
-        <a class="btn btn-default" data-toggle="modal" data-target="#systemTagModal">
-             add system tag
-         </a>
-         <div class="modal" id="systemTagModal">
-             <div class="modal-dialog">
-                 <div class="modal-content">
-                     <form class="well" method="post" action="{% url 'users:add-system-tag' guid=user.guid %}">
-                        <div class="modal-header">
-                            <button type="button" class="close" data-dismiss="modal">x</button>
-                            <h3>Add a system tag to this user</h3>
-                        </div>
-                        <div class="modal-body">
-                            {% csrf_token %}
-                            <input placeholder="Enter system tag" name="system_tag_to_add">
-                        </div>
-                        <div class="modal-footer">
-                            <input class="btn btn-danger" type="submit" value="Confirm" />
-                            <button type="button" class="btn btn-default"
-                                    data-dismiss="modal">
-                                Cancel
-                            </button>
-                        </div>
-                    </form>
-                 </div>
-             </div>
-         </div>
-    </td>
-</tr>
-
diff --git a/admin/templates/users/unflag_modal.html b/admin/templates/users/unflag_modal.html
index 06d9d8efd9e..e22ea9f8982 100644
--- a/admin/templates/users/unflag_modal.html
+++ b/admin/templates/users/unflag_modal.html
@@ -1,7 +1,7 @@
-<button class="btn btn-default" type="button" data-toggle="modal" data-target="#confirmSpamUnflagtModal" style="position: inline;">
+<button class="btn btn-default" type="button" data-toggle="modal" data-target="#confirmSpamUnflagModal" style="position: inline;">
     Remove Spam Flag
 </button>
-<div id="confirmSpamUnflagtModal" class="modal fade well" tabindex="-1" role="dialog">
+<div id="confirmSpamUnflagModal" class="modal fade well" tabindex="-1" role="dialog">
     <div class="modal-dialog" role="document">
         <div class="modal-content">
             <div class="modal-header">
diff --git a/admin/templates/users/user.html b/admin/templates/users/user.html
index 71bb25a5989..921900d01c8 100644
--- a/admin/templates/users/user.html
+++ b/admin/templates/users/user.html
@@ -78,6 +78,22 @@ <h2>User: <b>{{ user.username }}</b> <a href="{{ user.absolute_url }}"> ({{user.
                     <td>Full Name</td>
                     <td>{{ user.fullname }}</td>
                 </tr>
+                <tr>
+                    <td>First Name</td>
+                    <td>{{ user.given_name }}</td>
+                </tr>
+                <tr>
+                    <td>Last Name</td>
+                    <td>{{ user.family_name }}</td>
+                </tr>
+                <tr>
+                    <td>Middle Name</td>
+                    <td>{{ user.middle_names }}</td>
+                </tr>
+                <tr>
+                    <td>Suffix</td>
+                    <td>{{ user.suffix }}</td>
+                </tr>
                 <tr>
                     <td>Username</td>
                     <td>{{ user.username }}</td>
@@ -170,7 +186,7 @@ <h2>User: <b>{{ user.username }}</b> <a href="{{ user.absolute_url }}"> ({{user.
                         {{ user.is_staff }}
                     </td>
                 </tr>
-                {% include "users/add_system_tags.html" with user=user %}
+                {% include "nodes/add_system_tags.html" with resource=user %}
                 {% include "nodes/spam_status.html" with resource=user %}
                 <tr>
                     <td>Preprints</td>
diff --git a/admin/users/forms.py b/admin/users/forms.py
index e64a648ff77..01327a4eb73 100644
--- a/admin/users/forms.py
+++ b/admin/users/forms.py
@@ -19,7 +19,3 @@ class UserSearchForm(forms.Form):
 
 class MergeUserForm(forms.Form):
     user_guid_to_be_merged = forms.CharField(label='user_guid_to_be_merged', min_length=5, max_length=5, required=True)  # TODO: Move max to 6 when needed
-
-
-class AddSystemTagForm(forms.Form):
-    system_tag_to_add = forms.CharField(label='system_tag_to_add', min_length=1, max_length=1024, required=True)
diff --git a/admin/users/urls.py b/admin/users/urls.py
index 7f5d55ddb9b..309ba6bcd35 100644
--- a/admin/users/urls.py
+++ b/admin/users/urls.py
@@ -21,6 +21,7 @@
     re_path(r'^(?P<guid>[a-z0-9]+)/get_claim_urls/$', views.GetUserClaimLinks.as_view(), name='get-claim-urls'),
     re_path(r'^(?P<guid>[a-z0-9]+)/two-factor/disable/$', views.User2FactorDeleteView.as_view(), name='remove2factor'),
     re_path(r'^(?P<guid>[a-z0-9]+)/system_tags/add/$', views.UserAddSystemTag.as_view(), name='add-system-tag'),
+    re_path(r'^(?P<guid>[a-z0-9]+)/system_tags/(?P<tag_id>[a-z0-9]+)/remove/$', views.UserRemoveSystemTag.as_view(), name='remove-system-tag'),
     re_path(r'^(?P<guid>[a-z0-9]+)/get_confirmation/$', views.GetUserConfirmationLink.as_view(), name='get-confirmation'),
     re_path(r'^(?P<guid>[a-z0-9]+)/get_reset_password/$', views.GetPasswordResetLink.as_view(), name='get-reset-password'),
     re_path(r'^(?P<guid>[a-z0-9]+)/reindex_elastic_user/$', views.UserReindexElastic.as_view(),
diff --git a/admin/users/views.py b/admin/users/views.py
index 9072c66a989..bc4e550f88f 100644
--- a/admin/users/views.py
+++ b/admin/users/views.py
@@ -42,9 +42,9 @@
 from admin.users.forms import (
     EmailResetForm,
     UserSearchForm,
-    MergeUserForm,
-    AddSystemTagForm
+    MergeUserForm
 )
+from admin.nodes.views import NodeAddSystemTag, NodeRemoveSystemTag
 from admin.base.views import GuidView
 from api.users.services import send_password_reset_email
 from website.settings import DOMAIN
@@ -383,20 +383,16 @@ def post(self, request, *args, **kwargs):
         return redirect(self.get_success_url())
 
 
-class UserAddSystemTag(UserMixin, FormView):
+class UserAddSystemTag(UserMixin, NodeAddSystemTag):
     """ Allows authorized users to add system tags to a user.
     """
     permission_required = 'osf.change_osfuser'
-    raise_exception = True
-    form_class = AddSystemTagForm
 
-    def form_valid(self, form):
-        user = self.get_object()
-        system_tag_to_add = form.cleaned_data['system_tag_to_add']
-        user.add_system_tag(system_tag_to_add)
-        user.save()
 
-        return super().form_valid(form)
+class UserRemoveSystemTag(UserMixin, NodeRemoveSystemTag):
+    """ Allows authorized users to remove system tags from a user.
+    """
+    permission_required = 'osf.change_osfuser'
 
 
 class UserMergeAccounts(UserMixin, FormView):
diff --git a/admin_tests/nodes/test_views.py b/admin_tests/nodes/test_views.py
index 81459e046dc..aaea213b681 100644
--- a/admin_tests/nodes/test_views.py
+++ b/admin_tests/nodes/test_views.py
@@ -102,6 +102,7 @@ def test_name_data(self):
         node = ProjectFactory()
         guid = node._id
         request = RequestFactory().get('/fake_path')
+        request.user = AuthUserFactory()
         view = NodeView()
         view = setup_view(view, request, guid=guid)
         temp_object = view.get_object()
@@ -749,7 +750,7 @@ def test_can_revert_registration_with_unapproved_update_to_draft(self):
         assert from_draft.deleted is None
         assert from_draft.registered_node is None
 
-    def test_all_previous_data_is_restored_after_revertion(self):
+    def test_all_previous_data_is_restored_after_reversion(self):
         self.approve_version(self.get_current_version(self.registration))
 
         draft = DraftRegistration.objects.get(registered_node=self.registration)
@@ -775,7 +776,7 @@ def test_all_previous_data_is_restored_after_revertion(self):
         assert draft.contributors.count() == 4
         assert draft.tags.count() == 2
 
-    def test_contributors_approvals_are_reset_after_revertion(self):
+    def test_contributors_approvals_are_reset_after_reversion(self):
         contributors = self.pre_moderation_registration.contributors.all()
         for contributor in contributors:
             self.pre_moderation_registration.require_approval(contributor)
@@ -871,7 +872,7 @@ def test_can_revert_embargo_registration_to_draft(self):
 
         assert self.registration.sanction is None
 
-    def test_embargo_is_reset_after_revertion(self):
+    def test_embargo_is_reset_after_reversion(self):
         self.no_moderation_draft = DraftRegistrationFactory(
             title='embargo-registration',
             description='some description',
diff --git a/admin_tests/preprint_providers/test_views.py b/admin_tests/preprint_providers/test_views.py
index 83bba5eca0f..4d21e71cfd6 100644
--- a/admin_tests/preprint_providers/test_views.py
+++ b/admin_tests/preprint_providers/test_views.py
@@ -29,7 +29,7 @@
 from admin.preprint_providers import views
 from admin.preprint_providers.forms import PreprintProviderForm
 from admin.base.forms import ImportFileForm
-
+from django.contrib.messages.storage.fallback import FallbackStorage
 import website
 
 pytestmark = pytest.mark.django_db
@@ -273,7 +273,7 @@ def test_export_to_import_new_provider_with_models_out_of_sync(self):
         content_dict['fields']['_id'] = 'new_id'
         content_dict['fields']['name'] = 'Awesome New Name'
         content_dict['fields']['new_field'] = 'this is a new field, not in the model'
-        del content_dict['fields']['description']  # this is a old field, removed from the model JSON
+        del content_dict['fields']['description']  # this is an old field, removed from the model JSON
 
         data = StringIO(json.dumps(content_dict))
         self.import_request.FILES['file'] = InMemoryUploadedFile(data, None, 'data', 'application/json', 500, None, {})
@@ -424,3 +424,97 @@ def provider_factory(self):
     def view(self, req):
         plain_view = views.ProcessCustomTaxonomy()
         return setup_view(plain_view, req)
+
+
+from osf.migrations import update_provider_auth_groups
+
+@pytest.mark.urls('admin.base.urls')
+class TestEditModerators:
+
+    @pytest.fixture()
+    def req(self, user):
+        req = RequestFactory().get('/fake_path')
+        req.user = user
+        return req
+
+    @pytest.fixture()
+    def provider(self):
+        provider = PreprintProviderFactory()
+        update_provider_auth_groups()
+        return provider
+
+    @pytest.fixture()
+    def moderator(self, provider):
+        user = AuthUserFactory()
+        provider.add_to_group(user, 'moderator')
+        return user
+
+    @pytest.fixture()
+    def user(self):
+        return AuthUserFactory()
+
+    @pytest.fixture()
+    def remove_moderator_view(self, req, provider):
+        view = views.PreprintRemoveAdminsAndModerators()
+        view = setup_view(view, req)
+        view.kwargs = {'provider_id': provider.id}
+        return view
+
+    @pytest.fixture()
+    def add_moderator_view(self, req, provider):
+        view = views.PreprintAddAdminOrModerator()
+        view = setup_view(view, req)
+        view.kwargs = {'provider_id': provider.id}
+        return view
+
+    def test_get(self, add_moderator_view, remove_moderator_view, req):
+        res = add_moderator_view.get(req)
+        assert res.status_code == 200
+
+        res = remove_moderator_view.get(req)
+        assert res.status_code == 200
+
+    def test_post_remove(self, remove_moderator_view, req, moderator, provider):
+        moderator_id = f'Moderator-{moderator.id}'
+        req.POST = {
+            'csrfmiddlewaretoken': 'fake csfr',
+            moderator_id: ['on']
+        }
+
+        # django.contrib.messages has a bug which effects unittests
+        # more info here -> https://code.djangoproject.com/ticket/17971
+        setattr(req, 'session', 'session')
+        messages = FallbackStorage(req)
+        setattr(req, '_messages', messages)
+
+        res = remove_moderator_view.post(req)
+        assert res.status_code == 302
+        assert not provider.get_group('moderator').user_set.all()
+
+    def test_post_add(self, add_moderator_view, req, user, provider):
+        req.POST = {
+            'csrfmiddlewaretoken': 'fake csfr',
+            'add-moderators-form': [user._id],
+            'moderator': ['Add Moderator']
+        }
+
+        # django.contrib.messages has a bug which effects unittests
+        # more info here -> https://code.djangoproject.com/ticket/17971
+        setattr(req, 'session', 'session')
+        messages = FallbackStorage(req)
+        setattr(req, '_messages', messages)
+
+        res = add_moderator_view.post(req)
+        assert res.status_code == 302
+        assert user in provider.get_group('moderator').user_set.all()
+
+        # try to add the same user, but another group
+        req.POST = {
+            'csrfmiddlewaretoken': 'fake csfr',
+            'add-moderators-form': [user._id],
+            'admin': ['Add Admin']
+        }
+        res = add_moderator_view.post(req)
+        assert res.status_code == 302
+        assert user in provider.get_group('moderator').user_set.all()
+        assert user not in provider.get_group('admin').user_set.all()
diff --git a/admin_tests/preprints/test_views.py b/admin_tests/preprints/test_views.py
index 1273a3a6363..a9d29d0d69e 100644
--- a/admin_tests/preprints/test_views.py
+++ b/admin_tests/preprints/test_views.py
@@ -8,6 +8,7 @@
 from django.contrib.messages.storage.fallback import FallbackStorage
 
 from tests.base import AdminTestCase
+from framework.auth import Auth
 from osf.models import Preprint, PreprintLog, PreprintRequest
 from osf_tests.factories import (
     AuthUserFactory,
@@ -358,7 +359,7 @@ def test_preprint_spam_ham_workflow_if_preprint_is_private(self, preprint, super
 class TestPreprintReindex:
 
     def test_reindex_preprint_share(self, preprint, req, mock_update_share):
-        preprint.provider.access_token = 'totally real access token I bought from a guy wearing a trenchcoat in the summer'
+        preprint.provider.access_token = 'totally real access token I bought from a guy wearing a trench coat in the summer'
         preprint.provider.save()
 
         count = AdminLogEntry.objects.count()
@@ -410,6 +411,82 @@ def test_restore_preprint(self):
         assert AdminLogEntry.objects.count() == count + 1
 
 
+class TestPreprintHardDeleteView(AdminTestCase):
+    def setUp(self):
+        super().setUp()
+        self.user = AuthUserFactory()
+        self.user.is_staff = True
+        self.user.save()
+        self.preprint = PreprintFactory(creator=self.user, machine_state=DefaultStates.INITIAL.value)
+        self.plain_view = views.PreprintHardDeleteView
+
+    def test_hard_delete_initial_draft(self):
+        self.preprint.machine_state = DefaultStates.INITIAL.value
+        self.preprint.save()
+
+        request = RequestFactory().post('/fake_path')
+        request.user = self.user
+        patch_messages(request)
+
+        assert Preprint.objects.filter(id=self.preprint.id).exists()
+        assert self.preprint.machine_state == DefaultStates.INITIAL.value
+
+        view = setup_log_view(self.plain_view(), request, guid=self.preprint._id)
+        view.post(request)
+
+        assert not Preprint.objects.filter(id=self.preprint.id).exists()
+
+    def test_hard_delete_non_initial_state_fails(self):
+        self.preprint.machine_state = DefaultStates.PENDING.value
+        self.preprint.save()
+
+        versioned_guid = f"{self.preprint._id}_v{self.preprint.version}"
+
+        request = RequestFactory().post('/fake_path')
+        request.user = self.user
+        patch_messages(request)
+
+        view = setup_log_view(self.plain_view(), request, guid=versioned_guid)
+        view.post(request)
+        assert Preprint.objects.filter(id=self.preprint.id).exists()
+
+    def test_hard_delete_with_previous_versions(self):
+        published_preprint = PreprintFactory(creator=self.user, is_published=True)
+        published_preprint.machine_state = DefaultStates.ACCEPTED.value
+        published_preprint.save()
+
+        draft_preprint, _ = Preprint.create_version(
+            create_from_guid=published_preprint._id,
+            auth=Auth(published_preprint.creator),
+            ignore_permission=True
+        )
+        draft_preprint.machine_state = DefaultStates.INITIAL.value
+        draft_preprint.save()
+
+        base_guid = published_preprint.get_guid()
+        versions = base_guid.versions.all()
+        assert versions.count() == 2
+
+        assert base_guid.referent == draft_preprint
+
+        request = RequestFactory().post('/fake_path')
+        request.user = self.user
+        patch_messages(request)
+
+        view = setup_log_view(self.plain_view(), request, guid=base_guid._id)
+        view.post(request)
+
+        assert not Preprint.objects.filter(id=draft_preprint.id).exists()
+        assert Preprint.objects.filter(id=published_preprint.id).exists()
+
+        base_guid.refresh_from_db()
+        assert base_guid.referent == published_preprint
+
+        versions = base_guid.versions.all()
+        assert versions.count() == 1
+        assert versions.first().referent == published_preprint
+
+
 class TestRemoveContributor(AdminTestCase):
     def setUp(self):
         super().setUp()
@@ -834,3 +911,42 @@ def test_admin_user_can_add_new_version_one(self, user, preprint, plain_view):
         preprint.refresh_from_db()
 
         assert len(preprint.get_preprint_versions()) == 2
+
+    def test_osf_admin_can_create_new_version_with_unregistered_contributors(self, plain_view):
+        # user isn't admin contributor in the preprint
+        osf_admin = AuthUserFactory()
+        admin_group = Group.objects.get(name='osf_admin')
+        admin_group.permissions.add(Permission.objects.get(codename='change_node'))
+        osf_admin.groups.add(admin_group)
+
+        user = AuthUserFactory()
+        preprint_admin = AuthUserFactory()
+        preprint = PreprintFactory(creator=user)
+
+        preprint.add_permission(
+            preprint_admin,
+            ADMIN,
+            save=True
+        )
+
+        # assume admin contributor added an unregistered contributor
+        preprint.add_unregistered_contributor(
+            'Rheisen Dennis',
+            'reason@gmail.com',
+            auth=Auth(preprint_admin),
+            save=True
+        )
+
+        # osf admin recreates a new version 1 that forces to add unregistered contributors
+        # to this preprint
+        request = RequestFactory().post(
+            reverse('preprints:re-version-preprint',
+            kwargs={'guid': preprint._id}),
+            data={'file_versions': ['1']}
+        )
+        request.user = osf_admin
+
+        plain_view.as_view()(request, guid=preprint._id)
+        preprint.refresh_from_db()
+
+        assert len(preprint.get_preprint_versions()) == 2
diff --git a/admin_tests/registration_providers/test_views.py b/admin_tests/registration_providers/test_views.py
index 29e9b3f7223..1ab1ba97c5c 100644
--- a/admin_tests/registration_providers/test_views.py
+++ b/admin_tests/registration_providers/test_views.py
@@ -233,7 +233,7 @@ def test_get(self, view, req):
     def test_post(self, view, req, schema, provider):
         schema_id = schema.id
         req.POST = {
-            'csrfmiddlewaretoken': 'fake csfr',
+            'csrfmiddlewaretoken': 'fake csrf',
             str(schema_id): ['on']
         }
 
@@ -291,7 +291,7 @@ def test_get(self, add_moderator_view, remove_moderator_view, req):
     def test_post_remove(self, remove_moderator_view, req, moderator, provider):
         moderator_id = f'Moderator-{moderator.id}'
         req.POST = {
-            'csrfmiddlewaretoken': 'fake csfr',
+            'csrfmiddlewaretoken': 'fake csrf',
             moderator_id: ['on']
         }
 
@@ -307,7 +307,7 @@ def test_post_remove(self, remove_moderator_view, req, moderator, provider):
 
     def test_post_add(self, add_moderator_view, req, user, provider):
         req.POST = {
-            'csrfmiddlewaretoken': 'fake csfr',
+            'csrfmiddlewaretoken': 'fake csrf',
             'add-moderators-form': [user._id],
             'moderator': ['Add Moderator']
         }
@@ -324,7 +324,7 @@ def test_post_add(self, add_moderator_view, req, user, provider):
 
         # try to add the same user, but another group
         req.POST = {
-            'csrfmiddlewaretoken': 'fake csfr',
+            'csrfmiddlewaretoken': 'fake csrf',
             'add-moderators-form': [user._id],
             'admin': ['Add Admin']
         }
diff --git a/api_tests/identifiers/managment_commands/__init__.py b/admin_tests/registration_schemas/__init__.py
similarity index 100%
rename from api_tests/identifiers/managment_commands/__init__.py
rename to admin_tests/registration_schemas/__init__.py
diff --git a/admin_tests/regisration_schemas/test_views.py b/admin_tests/registration_schemas/test_views.py
similarity index 100%
rename from admin_tests/regisration_schemas/test_views.py
rename to admin_tests/registration_schemas/test_views.py
diff --git a/api/addons/views.py b/api/addons/views.py
index c0844401653..4aa14d1b580 100644
--- a/api/addons/views.py
+++ b/api/addons/views.py
@@ -59,7 +59,7 @@ def get_addon_settings(self, provider=None, fail_if_absent=True, check_object_pe
         return addon_settings
 
 class AddonList(JSONAPIBaseView, generics.ListAPIView, ListFilterMixin):
-    """The documentation for this endpoint can be found [here](https://developer.osf.io/#operation/addons_list).
+    """See [documentation for this endpoint](https://developer.osf.io/#operation/addons_list).
     """
     permission_classes = (
         drf_permissions.AllowAny,
diff --git a/api/base/authentication/drf.py b/api/base/authentication/drf.py
index b39de761d2e..9db2ca8faeb 100644
--- a/api/base/authentication/drf.py
+++ b/api/base/authentication/drf.py
@@ -60,7 +60,7 @@ def check_user(user):
     property of the user object. See ``created_by_external_idp_and_unconfirmed()`` for details.
 
     :param user: the user object to check
-    :raises `UnconfirmedAccountError` if the user was created via default useraname / password
+    :raises `UnconfirmedAccountError` if the user was created via default username / password
         sign-up, or if via ORCiD login with pending status "LINK" or "CREATE" to confirm
     :raises `UnclaimedAccountError` if the user was created as an unregistered contributor of a
         project or group waiting to be claimed
@@ -230,7 +230,7 @@ def authenticate(self, request):
         the primary key `id` or the email `username`.
 
         :param request: the request
-        :return: the user who owns the bear token and the cas repsonse
+        :return: the user who owns the bear token and the cas response
         """
 
         client = cas.get_client()
diff --git a/api/base/metrics.py b/api/base/metrics.py
index 9016c7a1012..d68f19a45b8 100644
--- a/api/base/metrics.py
+++ b/api/base/metrics.py
@@ -41,7 +41,7 @@ class MetricsViewMixin:
 
     @property
     def metric_map(self):
-        raise NotImplementedError('MetricsViewMixin sublcasses must define a metric_map class variable.')
+        raise NotImplementedError('MetricsViewMixin subclasses must define a metric_map class variable.')
 
     def get_annotated_queryset_with_metrics(self, queryset, metric_class, metric_name, after):
         """Return a queryset annotated with metrics. Use for list endpoints that expose metrics."""
@@ -90,7 +90,7 @@ def parse_metric_query_params(self, query_params):
 
     def _add_metrics(self, queryset_or_obj, method):
         """Parse the ?metric[METRIC]=PERIOD query param, validate it, and
-        run ``method`` for each each requested object.
+        run ``method`` for each requested object.
 
         This is used to share code between add_metric_to_object and get_metrics_queryset.
         """
diff --git a/api/base/pagination.py b/api/base/pagination.py
index a831673937c..f26e54bfbad 100644
--- a/api/base/pagination.py
+++ b/api/base/pagination.py
@@ -167,6 +167,23 @@ def paginate_queryset(self, queryset, request, view=None):
             return super().paginate_queryset(queryset, request, view=None)
 
 
+class JSONAPINoPagination(pagination.BasePagination):
+    '''do not accept page params nor paginate the queryset, but (for consistency with
+    JSONAPIPagination) do format the data into a jsonapi doc
+
+    possible future improvement: format jsonapi docs somewhere more reasonable
+    (like the renderer?) and delete this pagination class
+    '''
+    def paginate_queryset(self, queryset, request, view=None):
+        return queryset  # let it be
+
+    def get_paginated_response(self, data):
+        return Response({
+            'data': data,
+            'meta': {'total': len(data)},
+        })
+
+
 class MaxSizePagination(JSONAPIPagination):
     page_size = 1000
     max_page_size = None
diff --git a/api/base/parsers.py b/api/base/parsers.py
index 1536bbd1ff4..d0ce368e6a5 100644
--- a/api/base/parsers.py
+++ b/api/base/parsers.py
@@ -20,7 +20,7 @@
 
 class JSONSchemaParser(JSONParser):
     """
-    Parses JSON-serialized data and validates it against a jsonscehma on the view.
+    Parses JSON-serialized data and validates it against a jsonschema on the view.
     """
     media_type = 'application/vnd.api+json'
     renderer_class = JSONAPIRenderer
diff --git a/api/base/serializers.py b/api/base/serializers.py
index 5f430fbf7e6..b02450f2e12 100644
--- a/api/base/serializers.py
+++ b/api/base/serializers.py
@@ -432,7 +432,7 @@ def to_internal_value(self, data):
                     raise api_exceptions.Conflict(
                         detail=(
                             f'The id you used in the URL, "{id_field}", does not match the id you used in the json'
-                            f' body\'s id field, "{data}". The object "{id_field}" exists, otherwise you\'d get a'
+                            f' body\'s id field, "{data}". The object "{id_field}" exists; otherwise, you\'d get a'
                             f' 404, so most likely you need to change the id field to match.'
                         ),
                     )
@@ -711,7 +711,7 @@ def process_related_counts_parameters(self, params, value):
 
     def get_meta_information(self, meta_data, value):
         """
-        For retrieving meta values, otherwise returns {}
+        For retrieving meta values; otherwise, returns {}
         """
         meta = {}
         for key in meta_data or {}:
@@ -990,7 +990,7 @@ def to_representation(self, value):
 class TypedRelationshipField(RelationshipField):
     """ Overrides get_url to inject a typed namespace.
 
-        Assumption: Namespaces for each type MUST be the same as the dasharized JSONAPI-type
+        Assumption: Namespaces for each type MUST be the same as the dashed JSONAPI-type
     """
 
     def get_url(self, obj, view_name, request, format):
@@ -1481,7 +1481,7 @@ def to_esi_representation(self, data, envelope='data'):
         return super().to_representation(data)
 
     def run_validation(self, data):
-        # Overrides construtor for validated_data to allow writes to a SerializerMethodField
+        # Overrides constructor for validated_data to allow writes to a SerializerMethodField
         # Validation for writeable SMFs is expected to happen in the model
         _validated_data = super().run_validation(data)
         for field in self.writeable_method_fields:
@@ -1552,7 +1552,7 @@ def to_representation(self, obj, envelope='data'):
                     # if this is a RelationshipField, serialize as a null relationship
                     data['relationships'][field.field_name] = {'data': None}
                 else:
-                    # otherwise, serialize as an null attribute
+                    # otherwise, serialize as a null attribute
                     data['attributes'][field.field_name] = None
             else:
                 try:
diff --git a/api/base/settings/defaults.py b/api/base/settings/defaults.py
index 367ca1b04f9..efddf2484b8 100644
--- a/api/base/settings/defaults.py
+++ b/api/base/settings/defaults.py
@@ -101,6 +101,7 @@
 
     # Addons
     'addons.osfstorage',
+    'addons.azureblobstorage',
     'addons.bitbucket',
     'addons.boa',
     'addons.box',
@@ -221,7 +222,7 @@
     'api.base.middleware.CeleryTaskMiddleware',
     'api.base.middleware.PostcommitTaskMiddleware',
     # A profiling middleware. ONLY FOR DEV USE
-    # Uncomment and add "prof" to url params to recieve a profile for that url
+    # Uncomment and add "prof" to url params to receive a profile for that url
     # 'api.base.middleware.ProfileMiddleware',
     'corsheaders.middleware.CorsMiddleware',
     'django.middleware.common.CommonMiddleware',
diff --git a/api/base/utils.py b/api/base/utils.py
index c08c8c73977..9e5f6e1a445 100644
--- a/api/base/utils.py
+++ b/api/base/utils.py
@@ -178,7 +178,7 @@ def default_node_permission_queryset(user, model_cls):
 def default_node_list_permission_queryset(user, model_cls, **annotations):
     # **DO NOT** change the order of the querysets below.
     # If get_roots() is called on default_node_list_qs & default_node_permission_qs,
-    # Django's alaising will break and the resulting QS will be empty and you will be sad.
+    # Django's aliasing will break and the resulting QS will be empty and you will be sad.
     qs = default_node_permission_queryset(user, model_cls) & default_node_list_queryset(model_cls)
     if annotations:
         qs = qs.annotate(**annotations)
@@ -266,27 +266,6 @@ def assert_resource_type(obj, resource_tuple):
     assert isinstance(obj, resource_tuple), f'obj must be {a_or_an} {error_message}; got {obj}'
 
 
-class MockQueryset(list):
-    """
-    This class is meant to convert a simple list into a filterable queryset look-a-like.
-    """
-
-    def __init__(self, items, search, default_attrs=None, **kwargs):
-        self.search = search
-
-        for item in items:
-            if default_attrs:
-                item.update(default_attrs)
-            self.add_dict_as_item(item)
-
-    def __len__(self):
-        return self.search.count()
-
-    def add_dict_as_item(self, dict):
-        item = type('item', (object,), dict)
-        self.append(item)
-
-
 def toggle_view_by_flag(flag_name, old_view, new_view):
     '''toggle between view implementations based on a feature flag
 
diff --git a/api/base/versioning.py b/api/base/versioning.py
index 33a98fa50a1..ee97490fe6b 100644
--- a/api/base/versioning.py
+++ b/api/base/versioning.py
@@ -76,7 +76,7 @@ def get_header_version(self, request, major_version):
         return version
 
     def get_default_version(self, request, major_version):
-        """Returns the latest available version for the browsable api, otherwise REST_FRAMEWORK default version"""
+        """Returns the latest available version for the browsable api; otherwise, REST_FRAMEWORK default version"""
         if request.accepted_renderer.__class__ == BrowsableAPIRendererNoForms:
             return get_latest_sub_version(major_version)
         return self.default_version
diff --git a/api/base/views.py b/api/base/views.py
index e0f5873fe2b..a2e59cf7b0e 100644
--- a/api/base/views.py
+++ b/api/base/views.py
@@ -82,7 +82,7 @@ def partial(item):
                 'is_embedded': True,
             })
 
-            # Setup a view ourselves to avoid all the junk DRF throws in
+            # Set up a view ourselves to avoid all the junk DRF throws in
             # v is a function that hides everything v.cls is the actual view class
             view = v.cls()
             view.args = view_args
@@ -226,7 +226,7 @@ class LinkedNodesRelationship(JSONAPIBaseView, generics.RetrieveUpdateDestroyAPI
     node identifiers. This will replace the contents of the node_links for this collection with
     the contents of the request. It will delete all node links that don't have a node_id in the data
     array, create node links for the node_ids that don't currently have a node id, and do nothing
-    for node_ids that already have a corresponding node_link. This means a update request with
+    for node_ids that already have a corresponding node_link. This means an update request with
     {"data": []} will remove all node_links in this collection
 
     ###Destroy
@@ -332,7 +332,7 @@ class LinkedRegistrationsRelationship(JSONAPIBaseView, generics.RetrieveUpdateDe
     node identifiers. This will replace the contents of the node_links for this collection with
     the contents of the request. It will delete all node links that don't have a node_id in the data
     array, create node links for the node_ids that don't currently have a node id, and do nothing
-    for node_ids that already have a corresponding node_link. This means a update request with
+    for node_ids that already have a corresponding node_link. This means an update request with
     {"data": []} will remove all node_links in this collection
 
     ###Destroy
@@ -674,7 +674,7 @@ def bulk_get_file_nodes_from_wb_resp(self, files_list):
             }
 
             # Dataverse provides us two sets of files with the same path, so we disambiguate the paths, this
-            # preserves legacy behavior by distingishing them by version (Draft/Published).
+            # preserves legacy behavior by distinguishing them by version (Draft/Published).
             if attrs['provider'] == 'dataverse':
                 query.update({'_history__0__extra__datasetVersion': attrs['extra']['datasetVersion']})
 
diff --git a/api/brands/views.py b/api/brands/views.py
index 70b336560fc..3b376b2925f 100644
--- a/api/brands/views.py
+++ b/api/brands/views.py
@@ -34,7 +34,7 @@ def get_brand(self):
 
 
 class BrandList(JSONAPIBaseView, generics.ListAPIView, BrandMixin):
-    """The documentation for this endpoint can be found [here](https://developer.osf.io/#operation/institutions_list).
+    """See [documentation for this endpoint](https://developer.osf.io/#operation/institutions_list).
     """
     permission_classes = (
         drf_permissions.IsAuthenticatedOrReadOnly,
@@ -57,7 +57,7 @@ def get_queryset(self):
 
 
 class BrandDetail(JSONAPIBaseView, generics.RetrieveAPIView, BrandMixin):
-    """The documentation for this endpoint can be found [here](https://developer.osf.io/#operation/subjects_read).
+    """See [documentation for this endpoint](https://developer.osf.io/#operation/subjects_read).
     """
     permission_classes = (
         drf_permissions.IsAuthenticatedOrReadOnly,
diff --git a/api/caching/tasks.py b/api/caching/tasks.py
index a2a7753f51c..9a3a0264cc2 100644
--- a/api/caching/tasks.py
+++ b/api/caching/tasks.py
@@ -30,7 +30,7 @@ def get_bannable_urls(instance):
     parsed_absolute_url = {}
 
     if not hasattr(instance, 'absolute_api_v2_url'):
-        logger.warning(f'Tried to ban {instance.__class__}:{instance} but it didn\'t have a absolute_api_v2_url method')
+        logger.warning(f'Tried to ban {instance.__class__}:{instance} but it didn\'t have an absolute_api_v2_url method')
         return [], ''
 
     for host in get_varnish_servers():
diff --git a/api/chronos/README.md b/api/chronos/README.md
index b8be14a3b33..3ce8e469b7f 100644
--- a/api/chronos/README.md
+++ b/api/chronos/README.md
@@ -17,4 +17,4 @@ CHRONOS_USERNAME = <ask a dev for staging creds to put here>
 CHRONOS_PASSWORD =  <ask a dev for staging creds to put here>
 CHRONOS_API_KEY =  <ask a dev for staging creds to put here>
 
-The link 'Submit to an APA-published journal' should appear when looking at a accepted preprint in the provider you've added to config/environment.js.
+The link 'Submit to an APA-published journal' should appear when looking at an accepted preprint in the provider you've added to config/environment.js.
diff --git a/api/citations/views.py b/api/citations/views.py
index 92cb1c7162f..92b69463bb5 100644
--- a/api/citations/views.py
+++ b/api/citations/views.py
@@ -11,7 +11,7 @@
 
 
 class CitationStyleList(JSONAPIBaseView, generics.ListAPIView, ListFilterMixin):
-    """The documentation for this endpoint can be found [here](https://developer.osf.io/#operation/citations_styles_list).
+    """See [documentation for this endpoint](https://developer.osf.io/#operation/citations_styles_list).
     """
     permission_classes = (
         drf_permissions.IsAuthenticatedOrReadOnly,
@@ -35,7 +35,7 @@ def get_queryset(self):
         return self.get_queryset_from_request()
 
 class CitationStyleDetail(JSONAPIBaseView, generics.RetrieveAPIView):
-    """The documentation for this endpoint can be found [here](https://developer.osf.io/#operation/citations_styles_read).
+    """See [documentation for this endpoint](https://developer.osf.io/#operation/citations_styles_read).
     """
     permission_classes = (
         drf_permissions.IsAuthenticatedOrReadOnly,
diff --git a/api/collections/views.py b/api/collections/views.py
index 3680b0cb04a..fb8d808f888 100644
--- a/api/collections/views.py
+++ b/api/collections/views.py
@@ -471,7 +471,7 @@ def perform_update(self, serializer):
 
 
 class CollectionSubmissionSubjectsList(BaseResourceSubjectsList, CollectionMixin):
-    """The documentation for this endpoint can be found [here](https://developer.osf.io/#operation/collected_meta_subjects).
+    """See [documentation for this endpoint](https://developer.osf.io/#operation/collected_meta_subjects).
     """
     permission_classes = (
         drf_permissions.IsAuthenticatedOrReadOnly,
@@ -489,7 +489,7 @@ def get_resource(self):
 
 
 class CollectionSubmissionSubjectsRelationshipList(SubjectRelationshipBaseView, CollectionMixin):
-    """The documentation for this endpoint can be found [here](https://developer.osf.io/#operation/collected_meta_subjects_relationship).
+    """See [documentation for this endpoint](https://developer.osf.io/#operation/collected_meta_subjects_relationship).
     """
     permission_classes = (
         drf_permissions.IsAuthenticatedOrReadOnly,
@@ -942,7 +942,7 @@ class CollectionLinkedNodesRelationship(LinkedNodesRelationship, CollectionMixin
     node identifiers. This will replace the contents of the node_links for this collection with
     the contents of the request. It will delete all node links that don't have a node_id in the data
     array, create node links for the node_ids that don't currently have a node id, and do nothing
-    for node_ids that already have a corresponding node_link. This means a update request with
+    for node_ids that already have a corresponding node_link. This means an update request with
     {"data": []} will remove all node_links in this collection
 
     ###Destroy
@@ -1068,7 +1068,7 @@ class CollectionLinkedRegistrationsRelationship(CollectionLinkedNodesRelationshi
     node identifiers. This will replace the contents of the node_links for this collection with
     the contents of the request. It will delete all node links that don't have a node_id in the data
     array, create node links for the node_ids that don't currently have a node id, and do nothing
-    for node_ids that already have a corresponding node_link. This means a update request with
+    for node_ids that already have a corresponding node_link. This means an update request with
     {"data": []} will remove all node_links in this collection
 
     ###Destroy
diff --git a/api/comments/views.py b/api/comments/views.py
index 76cf84c0ad7..f09eb5d3d41 100644
--- a/api/comments/views.py
+++ b/api/comments/views.py
@@ -48,7 +48,7 @@ def get_comment(self, check_permissions=True):
 
 
 class CommentDetail(JSONAPIBaseView, generics.RetrieveUpdateDestroyAPIView, CommentMixin):
-    """The documentation for this endpoint can be found [here](https://developer.osf.io/#operation/comments_read).
+    """See [documentation for this endpoint](https://developer.osf.io/#operation/comments_read).
     """
     permission_classes = (
         drf_permissions.IsAuthenticatedOrReadOnly,
diff --git a/api/crossref/permissions.py b/api/crossref/permissions.py
index 76144eb5abc..b6c657a5b04 100644
--- a/api/crossref/permissions.py
+++ b/api/crossref/permissions.py
@@ -11,7 +11,7 @@
 class RequestComesFromMailgun(permissions.BasePermission):
     """Verify that request comes from Mailgun.
     Adapted here from conferences/message.py
-    Signature comparisons as recomended from mailgun docs:
+    Signature comparisons as recommended from mailgun docs:
     https://documentation.mailgun.com/en/latest/user_manual.html#webhooks
     """
     def has_permission(self, request, view):
diff --git a/api/crossref/views.py b/api/crossref/views.py
index 48edb378559..6925a6dad72 100644
--- a/api/crossref/views.py
+++ b/api/crossref/views.py
@@ -39,7 +39,7 @@ def post(self, request):
 
         if status == 'completed':
             guids = []
-            # Keep track of errors recieved, ignore those that are handled
+            # Keep track of errors received, ignore those that are handled
             unexpected_errors = False
             for record in records:
                 doi = getattr(record.find('doi'), 'text', None)
diff --git a/api/draft_registrations/serializers.py b/api/draft_registrations/serializers.py
index 84d0c48423c..dbb761d0df1 100644
--- a/api/draft_registrations/serializers.py
+++ b/api/draft_registrations/serializers.py
@@ -88,7 +88,7 @@ class DraftRegistrationSerializer(DraftRegistrationLegacySerializer, Taxonomizab
 
     current_user_permissions = ser.SerializerMethodField(
         help_text='List of strings representing the permissions '
-        'for the current user on this draft registratione.',
+        'for the current user on this draft registration.',
     )
 
     license = NodeLicenseRelationshipField(
diff --git a/api/files/serializers.py b/api/files/serializers.py
index 1fa8f2e2264..65d0f63358b 100644
--- a/api/files/serializers.py
+++ b/api/files/serializers.py
@@ -457,7 +457,7 @@ class FileVersionSerializer(JSONAPISerializer):
     ])
     id = ser.CharField(read_only=True, source='identifier')
     size = ser.IntegerField(read_only=True, help_text='The size of this file at this version')
-    content_type = ser.CharField(read_only=True, help_text='The mime type of this file at this verison')
+    content_type = ser.CharField(read_only=True, help_text='The mime type of this file at this version')
     date_created = VersionedDateTimeField(source='created', read_only=True, help_text='The date that this version was created')
     name = ser.SerializerMethodField()
     links = LinksField({
@@ -513,7 +513,7 @@ def get_render_link(self, obj):
 
 def get_file_download_link(obj, version=None, view_only=None):
     guid = obj.get_guid()
-    # Add '' to the path to ensure thare's a trailing slash
+    # Add '' to the path to ensure there's a trailing slash
     # The trailing slash avoids a 301
     # NOTE: furl encoding to be verified later
     url = furl(
diff --git a/api/files/views.py b/api/files/views.py
index 197c1dd3cdb..c19aec53d2c 100644
--- a/api/files/views.py
+++ b/api/files/views.py
@@ -63,7 +63,7 @@ def get_file(self, check_permissions=True):
 
 
 class FileDetail(JSONAPIBaseView, generics.RetrieveUpdateAPIView, FileMixin):
-    """The documentation for this endpoint can be found [here](https://developer.osf.io/#operation/files_detail).
+    """See [documentation for this endpoint](https://developer.osf.io/#operation/files_detail).
     """
     permission_classes = (
         drf_permissions.IsAuthenticatedOrReadOnly,
@@ -108,7 +108,7 @@ def get_object(self):
 
 
 class FileVersionsList(JSONAPIBaseView, generics.ListAPIView, FileMixin):
-    """The documentation for this endpoint can be found [here](https://developer.osf.io/#operation/files_versions).
+    """See [documentation for this endpoint](https://developer.osf.io/#operation/files_versions).
     """
     permission_classes = (
         drf_permissions.IsAuthenticatedOrReadOnly,
@@ -140,7 +140,7 @@ def node_from_version(request, view, obj):
 
 
 class FileVersionDetail(JSONAPIBaseView, generics.RetrieveAPIView, FileMixin):
-    """The documentation for this endpoint can be found [here](https://developer.osf.io/#operation/files_version_detail).
+    """See [documentation for this endpoint](https://developer.osf.io/#operation/files_version_detail).
     """
     version_lookup_url_kwarg = 'version_id'
     permission_classes = (
diff --git a/api/guids/views.py b/api/guids/views.py
index de9171a0451..3bd70cfb872 100644
--- a/api/guids/views.py
+++ b/api/guids/views.py
@@ -1,5 +1,6 @@
 from furl import furl
 from django import http
+from osf.models.base import VersionedGuidMixin
 from rest_framework.exceptions import NotFound
 from rest_framework import permissions as drf_permissions
 from rest_framework import generics
@@ -70,11 +71,17 @@ def get(self, request, **kwargs):
         raise NotFound
 
     def get_redirect_url(self, **kwargs):
-        guid = Guid.load(kwargs['guids'])
-        if guid:
-            referent = guid.referent
+        guid_str, version_number = Guid.split_guid(kwargs['guids'])
+        guid = Guid.load(guid_str)
+        if not guid:
+            return None
+        referent = guid.referent
+        if version_number and isinstance(referent, VersionedGuidMixin):
+            # if the guid string contains a version number and referent is versionable
+            return referent.get_versioned_absolute_api_v2_url(version_number)
+        else:
+            # if the guid string doesn't have a version number or the referent is not versionable
             if getattr(referent, 'absolute_api_v2_url', None):
                 return referent.absolute_api_v2_url
             else:
                 raise EndpointNotImplementedError()
-        return None
diff --git a/api/institutions/authentication.py b/api/institutions/authentication.py
index 6748d58af61..630c8210998 100644
--- a/api/institutions/authentication.py
+++ b/api/institutions/authentication.py
@@ -291,7 +291,7 @@ def authenticate(self, request):
                     activation_required = True
                     # Unconfirmed users already have a usable password set by the creator during
                     # sign-up. However, it must be overwritten by a new random one so the creator
-                    # (if he is not the real person) can not access the account after activation.
+                    # (if he is not the real person) cannot access the account after activation.
                     new_password_required = True
                     logger.warning(f'Institution SSO: user status - unconfirmed user {sso_user_info}')
                 else:
diff --git a/api/institutions/renderers.py b/api/institutions/renderers.py
deleted file mode 100644
index 353fcdfcce0..00000000000
--- a/api/institutions/renderers.py
+++ /dev/null
@@ -1,39 +0,0 @@
-from rest_framework_csv.renderers import CSVRenderer
-
-
-class MetricsCSVRenderer(CSVRenderer):
-    """
-    CSVRenderer with updated render method to export `data` dictionary of API Response to CSV
-    """
-
-    def render(self, data, media_type=None, renderer_context={}, writer_opts=None):
-        """
-        Overwrites CSVRenderer.render() to create a CSV with the data dictionary
-        instead of the entire API response. This is necessary for results to be
-        separated into different rows.
-        """
-        data = data.get('data')
-        return super().render(data, media_type=media_type, renderer_context=renderer_context, writer_opts=writer_opts)
-
-class InstitutionUserMetricsCSVRenderer(MetricsCSVRenderer):
-    """
-    MetricsCSVRenderer with headers and labels specific to the InstitutionUserMetrics Endpoint
-    """
-
-    header = ['id', 'attributes.user_name', 'attributes.public_projects', 'attributes.private_projects', 'type']
-    labels = {
-        'attributes.private_projects': 'private_projects',
-        'attributes.public_projects': 'public_projects',
-        'attributes.user_name': 'user_name',
-    }
-
-class InstitutionDepartmentMetricsCSVRenderer(MetricsCSVRenderer):
-    """
-    MetricsCSVRenderer with headers and labels specific to the InstitutionDepartmentMetrics Endpoint
-    """
-
-    header = ['id', 'attributes.name', 'attributes.number_of_users', 'type']
-    labels = {
-        'attributes.name': 'name',
-        'attributes.number_of_users': 'number_of_users',
-    }
diff --git a/api/institutions/serializers.py b/api/institutions/serializers.py
index 2af640f3b48..5beffe60348 100644
--- a/api/institutions/serializers.py
+++ b/api/institutions/serializers.py
@@ -21,7 +21,6 @@
 from api.base.serializers import YearmonthField
 from api.nodes.serializers import CompoundIDField
 from api.base.exceptions import RelationshipPostMakesNoChanges
-from api.base.utils import absolute_reverse
 
 
 class InstitutionSerializer(JSONAPISerializer):
@@ -205,30 +204,6 @@ def create(self, validated_data):
         }
 
 
-class InstitutionSummaryMetricSerializer(JSONAPISerializer):
-
-    class Meta:
-        type_ = 'institution-summary-metrics'
-
-    id = IDField(source='institution_id', read_only=True)
-    public_project_count = ser.IntegerField(read_only=True)
-    private_project_count = ser.IntegerField(read_only=True)
-    user_count = ser.IntegerField(read_only=True)
-
-    links = LinksField({
-        'self': 'get_absolute_url',
-    })
-
-    def get_absolute_url(self, obj):
-        return absolute_reverse(
-            'institutions:institution-summary-metrics',
-            kwargs={
-                'institution_id': self.context['request'].parser_context['kwargs']['institution_id'],
-                'version': 'v2',
-            },
-        )
-
-
 class UniqueDeptIDField(CompoundIDField):
     """Creates a unique department ID of the form "<institution-id>-<dept-id>"."""
 
@@ -255,74 +230,12 @@ class Meta:
     name = ser.CharField(read_only=True)
     number_of_users = ser.IntegerField(read_only=True)
 
-    links = LinksField({
-        'self': 'get_absolute_url',
-    })
-
-    filterable_fields = frozenset([
-        'id',
-        'name',
-        'number_of_users',
-    ])
-
     def get_absolute_url(self, obj):
-        return absolute_reverse(
-            'institutions:institution-department-metrics',
-            kwargs={
-                'institution_id': self.context['request'].parser_context['kwargs']['institution_id'],
-                'version': 'v2',
-            },
-        )
+        raise NotImplementedError()
 
 
-class OldInstitutionUserMetricsSerializer(JSONAPISerializer):
+class InstitutionUserMetricsSerializer(JSONAPISerializer):
     '''serializer for institution-users metrics
-
-    used only when the INSTITUTIONAL_DASHBOARD_2024 feature flag is NOT active
-    (and should be removed when that flag is permanently active)
-    '''
-
-    class Meta:
-        type_ = 'institution-users'
-
-    id = IDField(source='user_id', read_only=True)
-    user_name = ser.CharField(read_only=True)
-    public_projects = ser.IntegerField(source='public_project_count', read_only=True)
-    private_projects = ser.IntegerField(source='private_project_count', read_only=True)
-    department = ser.CharField(read_only=True)
-
-    user = RelationshipField(
-        related_view='users:user-detail',
-        related_view_kwargs={'user_id': '<user_id>'},
-    )
-
-    links = LinksField({
-        'self': 'get_absolute_url',
-    })
-
-    filterable_fields = frozenset([
-        'id',
-        'user_name',
-        'public_projects',
-        'private_projects',
-        'department',
-    ])
-
-    def get_absolute_url(self, obj):
-        return absolute_reverse(
-            'institutions:institution-user-metrics',
-            kwargs={
-                'institution_id': self.context['request'].parser_context['kwargs']['institution_id'],
-                'version': 'v2',
-            },
-        )
-
-
-class NewInstitutionUserMetricsSerializer(JSONAPISerializer):
-    '''serializer for institution-users metrics
-
-    used only when the INSTITUTIONAL_DASHBOARD_2024 feature flag is active
-    (and should be renamed without "New" when that flag is permanently active)
     '''
 
     class Meta:
@@ -360,11 +273,6 @@ class Meta:
     )
     contacts = ser.SerializerMethodField()
 
-    links = LinksField({})
-
-    def get_absolute_url(self):
-        return None  # there is no detail view for institution-users
-
     def get_contacts(self, obj):
         user = OSFUser.load(obj._d_['user_id'])
         if not user:
@@ -380,12 +288,12 @@ def get_contacts(self, obj):
         ).order_by('sender_name')
         return list(results)
 
+    def get_absolute_url(self, obj):
+        raise NotImplementedError()
 
-class NewInstitutionSummaryMetricsSerializer(JSONAPISerializer):
-    '''serializer for institution-summary metrics
 
-    used only when the INSTITUTIONAL_DASHBOARD_2024 feature flag is active
-    (and should be renamed without "New" when that flag is permanently active)
+class InstitutionSummaryMetricsSerializer(JSONAPISerializer):
+    '''serializer for institution-summary metrics
     '''
 
     class Meta:
@@ -414,10 +322,8 @@ class Meta:
         related_view_kwargs={'institution_id': '<institution_id>'},
     )
 
-    links = LinksField({})
-
-    def get_absolute_url(self):
-        return None  # there is no detail view for institution-users
+    def get_absolute_url(self, obj):
+        raise NotImplementedError()
 
 
 class InstitutionRelated(JSONAPIRelationshipSerializer):
diff --git a/api/institutions/urls.py b/api/institutions/urls.py
index 477fe8d9377..90b5bc3c7e7 100644
--- a/api/institutions/urls.py
+++ b/api/institutions/urls.py
@@ -13,7 +13,7 @@
     re_path(r'^(?P<institution_id>\w+)/relationships/registrations/$', views.InstitutionRegistrationsRelationship.as_view(), name=views.InstitutionRegistrationsRelationship.view_name),
     re_path(r'^(?P<institution_id>\w+)/relationships/nodes/$', views.InstitutionNodesRelationship.as_view(), name=views.InstitutionNodesRelationship.view_name),
     re_path(r'^(?P<institution_id>\w+)/users/$', views.InstitutionUserList.as_view(), name=views.InstitutionUserList.view_name),
-    re_path(r'^(?P<institution_id>\w+)/metrics/summary/$', views.institution_summary_metrics_detail_view, name=views.institution_summary_metrics_detail_view.view_name),
+    re_path(r'^(?P<institution_id>\w+)/metrics/summary/$', views.InstitutionSummaryMetricsDetail.as_view(), name=views.InstitutionSummaryMetricsDetail.view_name),
     re_path(r'^(?P<institution_id>\w+)/metrics/departments/$', views.InstitutionDepartmentList.as_view(), name=views.InstitutionDepartmentList.view_name),
-    re_path(r'^(?P<institution_id>\w+)/metrics/users/$', views.institution_user_metrics_list_view, name=views.institution_user_metrics_list_view.view_name),
+    re_path(r'^(?P<institution_id>\w+)/metrics/users/$', views.InstitutionUserMetricsList.as_view(), name=views.InstitutionUserMetricsList.view_name),
 ]
diff --git a/api/institutions/views.py b/api/institutions/views.py
index 9424a69fa10..60f8d31b88f 100644
--- a/api/institutions/views.py
+++ b/api/institutions/views.py
@@ -1,3 +1,4 @@
+from django.conf import settings
 from django.db.models import F
 from rest_framework import generics
 from rest_framework import permissions as drf_permissions
@@ -8,10 +9,7 @@
 
 from framework.auth.oauth_scopes import CoreScopes
 
-import osf.features
-from osf.metrics import InstitutionProjectCounts
 from osf.models import OSFUser, Node, Institution, Registration
-from osf.metrics import UserInstitutionProjectCounts
 from osf.metrics.reports import InstitutionalUserReport, InstitutionMonthlySummaryReport
 from osf.metrics.utils import YearMonth
 from osf.utils import permissions as osf_permissions
@@ -22,18 +20,12 @@
 from api.base.views import JSONAPIBaseView
 from api.base.serializers import JSONAPISerializer
 from api.base.utils import get_object_or_error, get_user_auth
-from api.base.pagination import JSONAPIPagination, MaxSizePagination
+from api.base.pagination import MaxSizePagination, JSONAPINoPagination
 from api.base.parsers import (
     JSONAPIRelationshipParser,
     JSONAPIRelationshipParserForRegularJSON,
 )
-from api.base.settings import MAX_SIZE_OF_ES_QUERY
 from api.base.exceptions import RelationshipPostMakesNoChanges
-from api.base.utils import (
-    MockQueryset,
-    toggle_view_by_flag,
-)
-from api.base.settings import DEFAULT_ES_NULL_VALUE
 from api.metrics.permissions import IsInstitutionalMetricsUser
 from api.metrics.renderers import (
     MetricsReportsCsvRenderer,
@@ -50,14 +42,11 @@
     InstitutionSerializer,
     InstitutionNodesRelationshipSerializer,
     InstitutionRegistrationsRelationshipSerializer,
-    InstitutionSummaryMetricSerializer,
     InstitutionDepartmentMetricsSerializer,
-    NewInstitutionUserMetricsSerializer,
-    OldInstitutionUserMetricsSerializer,
-    NewInstitutionSummaryMetricsSerializer,
+    InstitutionUserMetricsSerializer,
+    InstitutionSummaryMetricsSerializer,
 )
 from api.institutions.permissions import UserIsAffiliated
-from api.institutions.renderers import InstitutionDepartmentMetricsCSVRenderer, InstitutionUserMetricsCSVRenderer, MetricsCSVRenderer
 
 
 class InstitutionMixin:
@@ -77,7 +66,7 @@ def get_institution(self):
 
 
 class InstitutionList(JSONAPIBaseView, generics.ListAPIView, ListFilterMixin):
-    """The documentation for this endpoint can be found [here](https://developer.osf.io/#operation/institutions_list).
+    """See [documentation for this endpoint](https://developer.osf.io/#operation/institutions_list).
     """
     permission_classes = (
         drf_permissions.IsAuthenticatedOrReadOnly,
@@ -104,7 +93,7 @@ def get_queryset(self):
 
 
 class InstitutionDetail(JSONAPIBaseView, generics.RetrieveAPIView, InstitutionMixin):
-    """The documentation for this endpoint can be found [here](https://developer.osf.io/#operation/institutions_detail).
+    """See [documentation for this endpoint](https://developer.osf.io/#operation/institutions_detail).
     """
     permission_classes = (
         drf_permissions.IsAuthenticatedOrReadOnly,
@@ -125,7 +114,7 @@ def get_object(self):
 
 
 class InstitutionNodeList(JSONAPIBaseView, generics.ListAPIView, InstitutionMixin, NodesFilterMixin):
-    """The documentation for this endpoint can be found [here](https://developer.osf.io/#operation/institutions_node_list).
+    """See [documentation for this endpoint](https://developer.osf.io/#operation/institutions_node_list).
     """
     permission_classes = (
         drf_permissions.IsAuthenticatedOrReadOnly,
@@ -160,7 +149,7 @@ def get_queryset(self):
 
 
 class InstitutionUserList(JSONAPIBaseView, ListFilterMixin, generics.ListAPIView, InstitutionMixin):
-    """The documentation for this endpoint can be found [here](https://developer.osf.io/#operation/institutions_users_list).
+    """See [documentation for this endpoint](https://developer.osf.io/#operation/institutions_users_list).
     """
     permission_classes = (
         drf_permissions.IsAuthenticatedOrReadOnly,
@@ -187,7 +176,7 @@ def get_queryset(self):
 
 
 class InstitutionAuth(JSONAPIBaseView, generics.CreateAPIView):
-    """A dedicated view for institution auth, a.k.a "login through institutions".
+    """A dedicated view for institution auth, a.k.a. "login through institutions".
 
     This view is only used and should only be used by CAS.  Changing it may break the institution
     login feature.  Please check with @longze and @matt before making any changes.
@@ -215,7 +204,7 @@ def post(self, request, *args, **kwargs):
 
 
 class InstitutionRegistrationList(InstitutionNodeList):
-    """The documentation for this endpoint can be found [here](https://developer.osf.io/#operation/institutions_registration_list).
+    """See [documentation for this endpoint](https://developer.osf.io/#operation/institutions_registration_list).
     """
     serializer_class = RegistrationSerializer
     view_name = 'institution-registrations'
@@ -398,155 +387,64 @@ def create(self, *args, **kwargs):
         return ret
 
 
-class _OldInstitutionSummaryMetrics(JSONAPIBaseView, generics.RetrieveAPIView, InstitutionMixin):
-    permission_classes = (
-        drf_permissions.IsAuthenticatedOrReadOnly,
-        base_permissions.TokenHasScope,
-        IsInstitutionalMetricsUser,
-    )
-
-    required_read_scopes = [CoreScopes.INSTITUTION_METRICS_READ]
-    required_write_scopes = [CoreScopes.NULL]
-
+class InstitutionDepartmentList(InstitutionMixin, ElasticsearchListView):
     view_category = 'institutions'
-    view_name = 'institution-summary-metrics'
-
-    serializer_class = InstitutionSummaryMetricSerializer
-
-    # overrides RetrieveAPIView
-    def get_object(self):
-        institution = self.get_institution()
-        return InstitutionProjectCounts.get_latest_institution_project_document(institution)
-
+    view_name = 'institution-department-metrics'
 
-class InstitutionImpactList(JSONAPIBaseView, ListFilterMixin, generics.ListAPIView, InstitutionMixin):
     permission_classes = (
         drf_permissions.IsAuthenticatedOrReadOnly,
         base_permissions.TokenHasScope,
         IsInstitutionalMetricsUser,
     )
-
     required_read_scopes = [CoreScopes.INSTITUTION_METRICS_READ]
     required_write_scopes = [CoreScopes.NULL]
 
-    view_category = 'institutions'
-
-    @property
-    def is_csv_export(self):
-        if isinstance(self.request.accepted_renderer, MetricsCSVRenderer):
-            return True
-        return False
-
-    @property
-    def pagination_class(self):
-        if self.is_csv_export:
-            return MaxSizePagination
-        return JSONAPIPagination
-
-    def _format_search(self, search, default_kwargs=None):
-        raise NotImplementedError()
-
-    def _paginate(self, search):
-        if self.pagination_class is MaxSizePagination:
-            return search.extra(size=MAX_SIZE_OF_ES_QUERY)
-
-        page = self.request.query_params.get('page')
-        page_size = self.request.query_params.get('page[size]')
-
-        if page_size:
-            page_size = int(page_size)
-        else:
-            page_size = api_settings.PAGE_SIZE
-
-        if page:
-            search = search.extra(size=int(page) * page_size)
-        return search
-
-    def _make_elasticsearch_results_filterable(self, search, **kwargs) -> MockQueryset:
-        """
-        Since ES returns a list obj instead of a awesome filterable queryset we are faking the filter feature used by
-        querysets by create a mock queryset with limited filterbility.
-
-        :param departments: Dict {'Department Name': 3} means "Department Name" has 3 users.
-        :return: mock_queryset
-        """
-        items = self._format_search(search, default_kwargs=kwargs)
-
-        search = self._paginate(search)
-
-        queryset = MockQueryset(items, search)
-        return queryset
-
-    # overrides RetrieveApiView
-    def get_queryset(self):
-        return self.get_queryset_from_request()
-
-
-class InstitutionDepartmentList(InstitutionImpactList):
-    view_name = 'institution-department-metrics'
-
     serializer_class = InstitutionDepartmentMetricsSerializer
-    renderer_classes = tuple(api_settings.DEFAULT_RENDERER_CLASSES) + (InstitutionDepartmentMetricsCSVRenderer,)
-
-    ordering_fields = ('-number_of_users', 'name')
-    ordering = ('-number_of_users', 'name')
+    renderer_classes = (
+        *api_settings.DEFAULT_RENDERER_CLASSES,
+        MetricsReportsCsvRenderer,
+        MetricsReportsTsvRenderer,
+        MetricsReportsJsonRenderer,
+    )
+    pagination_class = JSONAPINoPagination
 
-    def _format_search(self, search, default_kwargs=None):
-        results = search.execute()
+    def get_default_search(self):
+        _base_search = (
+            InstitutionalUserReport.search()
+            .filter('term', institution_id=self.get_institution()._id)
+        )
+        _yearmonth = InstitutionalUserReport.most_recent_yearmonth(base_search=_base_search)
+        if _yearmonth is None:
+            return None
+        _search = (
+            _base_search
+            .filter('term', report_yearmonth=str(_yearmonth))
+            .exclude('term', user_name='Deleted user')
+        )
+        # add aggregation on department name
+        _search.aggs.bucket(
+            'agg_departments',
+            'terms',
+            field='department_name',
+            missing=settings.DEFAULT_ES_NULL_VALUE,
+            size=settings.MAX_SIZE_OF_ES_QUERY,
+        )
+        return _search
 
-        if results.aggregations:
-            buckets = results.aggregations['date_range']['departments'].buckets
-            department_data = [{'name': bucket['key'], 'number_of_users': bucket['doc_count']} for bucket in buckets]
-            return department_data
-        else:
+    def get_queryset(self):
+        # execute the search and return a list from the aggregation on department name
+        _search = super().get_queryset()
+        if not _search:
             return []
-
-    def get_default_queryset(self):
-        institution = self.get_institution()
-        search = UserInstitutionProjectCounts.get_department_counts(institution)
-        return self._make_elasticsearch_results_filterable(search, id=institution._id)
+        _results = _search[0:0].execute()
+        return [
+            {'name': _bucket['key'], 'number_of_users': _bucket['doc_count']}
+            for _bucket in _results.aggregations['agg_departments'].buckets
+        ]
 
 
-class _OldInstitutionUserMetricsList(InstitutionImpactList):
+class InstitutionUserMetricsList(InstitutionMixin, ElasticsearchListView):
     '''list view for institution-users metrics
-
-    used only when the INSTITUTIONAL_DASHBOARD_2024 feature flag is NOT active
-    (and should be removed when that flag is permanently active)
-    '''
-    view_name = 'institution-user-metrics'
-
-    serializer_class = OldInstitutionUserMetricsSerializer
-    renderer_classes = tuple(api_settings.DEFAULT_RENDERER_CLASSES) + (InstitutionUserMetricsCSVRenderer,)
-
-    ordering_fields = ('user_name', 'department')
-    ordering = ('user_name',)
-
-    def _format_search(self, search, default_kwargs=None):
-        results = search.execute()
-
-        users = []
-        for user_record in results:
-            record_dict = {}
-            record_dict.update(default_kwargs)
-            record_dict.update(user_record.to_dict())
-            user_id = user_record.user_id
-            fullname = OSFUser.objects.get(guids___id=user_id).fullname
-            record_dict['user_name'] = fullname
-            users.append(record_dict)
-
-        return users
-
-    def get_default_queryset(self):
-        institution = self.get_institution()
-        search = UserInstitutionProjectCounts.get_current_user_metrics(institution)
-        return self._make_elasticsearch_results_filterable(search, id=institution._id, department=DEFAULT_ES_NULL_VALUE)
-
-
-class _NewInstitutionUserMetricsList(InstitutionMixin, ElasticsearchListView):
-    '''list view for institution-users metrics
-
-    used only when the INSTITUTIONAL_DASHBOARD_2024 feature flag is active
-    (and should be renamed without "New" when that flag is permanently active)
     '''
     permission_classes = (
         drf_permissions.IsAuthenticatedOrReadOnly,
@@ -566,7 +464,7 @@ class _NewInstitutionUserMetricsList(InstitutionMixin, ElasticsearchListView):
         MetricsReportsJsonRenderer,
     )
 
-    serializer_class = NewInstitutionUserMetricsSerializer
+    serializer_class = InstitutionUserMetricsSerializer
 
     default_ordering = '-storage_byte_count'
     ordering_fields = frozenset((
@@ -585,22 +483,23 @@ class _NewInstitutionUserMetricsList(InstitutionMixin, ElasticsearchListView):
     ))
 
     def get_default_search(self):
-        _yearmonth = InstitutionalUserReport.most_recent_yearmonth()
-        if _yearmonth is None:
+        base_search = InstitutionalUserReport.search().filter(
+            'term',
+            institution_id=self.get_institution()._id,
+        )
+        yearmonth = InstitutionalUserReport.most_recent_yearmonth(base_search=base_search)
+        if yearmonth is None:
             return None
+
         return (
-            InstitutionalUserReport.search()
-            .filter('term', report_yearmonth=str(_yearmonth))
-            .filter('term', institution_id=self.get_institution()._id)
+            base_search
+            .filter('term', report_yearmonth=str(yearmonth))
             .exclude('term', user_name='Deleted user')
         )
 
 
-class _NewInstitutionSummaryMetricsDetail(JSONAPIBaseView, generics.RetrieveAPIView, InstitutionMixin):
+class InstitutionSummaryMetricsDetail(JSONAPIBaseView, generics.RetrieveAPIView, InstitutionMixin):
     '''detail view for institution-summary metrics
-
-    used only when the INSTITUTIONAL_DASHBOARD_2024 feature flag is active
-    (and should be renamed without "New" when that flag is permanently active)
     '''
     permission_classes = (
         drf_permissions.IsAuthenticatedOrReadOnly,
@@ -614,7 +513,7 @@ class _NewInstitutionSummaryMetricsDetail(JSONAPIBaseView, generics.RetrieveAPIV
     view_category = 'institutions'
     view_name = 'institution-summary-metrics'
 
-    serializer_class = NewInstitutionSummaryMetricsSerializer
+    serializer_class = InstitutionSummaryMetricsSerializer
 
     def get_object(self):
         institution = self.get_institution()
@@ -643,19 +542,3 @@ def get_default_search(self):
             'term',
             report_yearmonth=str(yearmonth),
         )
-
-
-institution_summary_metrics_detail_view = toggle_view_by_flag(
-    flag_name=osf.features.INSTITUTIONAL_DASHBOARD_2024,
-    old_view=_OldInstitutionSummaryMetrics.as_view(),
-    new_view=_NewInstitutionSummaryMetricsDetail.as_view(),
-)
-institution_summary_metrics_detail_view.view_name = 'institution-summary-metrics'
-
-
-institution_user_metrics_list_view = toggle_view_by_flag(
-    flag_name=osf.features.INSTITUTIONAL_DASHBOARD_2024,
-    old_view=_OldInstitutionUserMetricsList.as_view(),
-    new_view=_NewInstitutionUserMetricsList.as_view(),
-)
-institution_user_metrics_list_view.view_name = 'institution-user-metrics'
diff --git a/api/licenses/views.py b/api/licenses/views.py
index 324740cb848..86d559f5915 100644
--- a/api/licenses/views.py
+++ b/api/licenses/views.py
@@ -12,7 +12,7 @@
 
 
 class LicenseDetail(JSONAPIBaseView, generics.RetrieveAPIView):
-    """The documentation for this endpoint can be found [here](https://developer.osf.io/#operation/licenses_read).
+    """See [documentation for this endpoint](https://developer.osf.io/#operation/licenses_read).
     """
     permission_classes = (
         drf_permissions.IsAuthenticatedOrReadOnly,
@@ -40,7 +40,7 @@ def get_object(self):
 
 
 class LicenseList(JSONAPIBaseView, generics.ListAPIView, ListFilterMixin):
-    """The documentation for this endpoint can be found [here](https://developer.osf.io/#operation/license_list).
+    """See [documentation for this endpoint](https://developer.osf.io/#operation/license_list).
     """
     permission_classes = (
         drf_permissions.IsAuthenticatedOrReadOnly,
diff --git a/api/logs/serializers.py b/api/logs/serializers.py
index 5d5df3fc882..51567b991f3 100644
--- a/api/logs/serializers.py
+++ b/api/logs/serializers.py
@@ -143,7 +143,7 @@ def get_contributors(self, obj):
 
         if contributor_data:
             contributor_ids = [each for each in contributor_data if isinstance(each, str)]
-            # Very old logs may contain contributror data with dictionaries for non-registered contributors,
+            # Very old logs may contain contributor data with dictionaries for non-registered contributors,
             # e.g. {'nr_email': 'foo@bar.com', 'nr_name': 'Foo Bar'}
             non_registered_contributor_data = [each for each in contributor_data if isinstance(each, dict)]
 
diff --git a/api/logs/views.py b/api/logs/views.py
index 03fa3721069..b3b2ddd4285 100644
--- a/api/logs/views.py
+++ b/api/logs/views.py
@@ -30,7 +30,7 @@ def get_log(self):
 
 
 class NodeLogDetail(JSONAPIBaseView, generics.RetrieveAPIView, LogMixin):
-    """The documentation for this endpoint can be found [here](https://developer.osf.io/#operation/logs_read).
+    """See [documentation for this endpoint](https://developer.osf.io/#operation/logs_read).
     """
     permission_classes = (
         drf_permissions.IsAuthenticatedOrReadOnly,
diff --git a/api/meetings/serializers.py b/api/meetings/serializers.py
index f6b04f1c056..a292decd399 100644
--- a/api/meetings/serializers.py
+++ b/api/meetings/serializers.py
@@ -125,7 +125,7 @@ def get_author_name(self, obj):
 
     def get_meeting_category(self, obj):
         """
-        Returns the existance of a certain tag on the node.  If the first submission type tag exists,
+        Returns the existence of a certain tag on the node.  If the first submission type tag exists,
         return that.  Otherwise, return the second submission type tag as a default.
         """
         if getattr(obj, 'meeting_category', None):
diff --git a/api/meetings/views.py b/api/meetings/views.py
index ca0b89f35a3..bc31c35bcea 100644
--- a/api/meetings/views.py
+++ b/api/meetings/views.py
@@ -168,7 +168,7 @@ def annotate_queryset_with_meeting_category(self, meeting, queryset):
 
     def annotate_queryset_with_author_name(self, queryset):
         """
-        Annotates queryset with author_name_category - it is the family_name if it exists, otherwise,
+        Annotates queryset with author_name_category - it is the family_name if it exists; otherwise,
         the fullname is used
         """
         # Setup author name subquery (really first bibliographic contributor)
diff --git a/api/metaschemas/views.py b/api/metaschemas/views.py
index 3450d292945..23b99c39555 100644
--- a/api/metaschemas/views.py
+++ b/api/metaschemas/views.py
@@ -18,7 +18,7 @@ class DeprecatedRegistrationMetaSchemaDetail(DeprecatedView, views.RegistrationS
 
 
 class DeprecatedMetaSchemasList(DeprecatedView, views.RegistrationSchemaList):
-    """The documentation for this endpoint can be found [here](https://developer.osf.io/#operation/metaschemas_list).
+    """See [documentation for this endpoint](https://developer.osf.io/#operation/metaschemas_list).
     """
     max_version = '2.7'
     view_category = 'metaschemas'
@@ -27,7 +27,7 @@ class DeprecatedMetaSchemasList(DeprecatedView, views.RegistrationSchemaList):
 
 
 class DeprecatedMetaSchemaDetail(DeprecatedView, views.RegistrationSchemaDetail):
-    """The documentation for this endpoint can be found [here](https://developer.osf.io/#operation/metaschemas_read).
+    """See [documentation for this endpoint](https://developer.osf.io/#operation/metaschemas_read).
     """
     max_version = '2.7'
     view_category = 'metaschemas'
diff --git a/api/metrics/views.py b/api/metrics/views.py
index 51556ddc89c..daaa684d13a 100644
--- a/api/metrics/views.py
+++ b/api/metrics/views.py
@@ -582,7 +582,7 @@ def get(self, request, *args):
             tsEnd = request.GET.get('timeframeEnd')
             report_date = {'gte': tsStart, 'lt': tsEnd}
         else:
-            pass  # just fallback to days_back for now
+            pass  # just fall back to days_back for now
 
         timespan = report_date
         analytics_result = self._run_query(timespan)
diff --git a/api/nodes/serializers.py b/api/nodes/serializers.py
index 18ec0c46dde..e32c366b808 100644
--- a/api/nodes/serializers.py
+++ b/api/nodes/serializers.py
@@ -583,7 +583,7 @@ def get_current_user_can_comment(self, obj):
             return obj.can_comment(auth)
 
     def get_preprint(self, obj):
-        # Whether the node has supplemental material for a preprint the user can view
+        # Whether the node has supplemental material for a preprint that the user can view
         if hasattr(obj, 'has_viewable_preprints'):
             # if queryset has been annotated with "has_viewable_preprints", use this value
             return obj.has_viewable_preprints
@@ -628,7 +628,7 @@ def get_collection_count(self, obj):
     def get_node_count(self, obj):
         """
         Returns the count of a node's direct children that the user has permission to view.
-        Implict admin and group membership are factored in when determining perms.
+        Implicit admin and group membership are factored in when determining perms.
         """
         auth = get_user_auth(self.context['request'])
         user_id = getattr(auth.user, 'id', None)
@@ -1301,6 +1301,12 @@ def update(self, instance, validated_data):
             validated_data,
         )
 
+class NodeContributorsUpdateSerializer(ser.Serializer):
+    def update(self, instance, validated_data):
+        if project := instance.root:
+            instance.copy_contributors_from(project)
+        return instance
+
 
 class NodeLinksSerializer(JSONAPISerializer):
 
@@ -1910,7 +1916,7 @@ def update_forward_fields(self, obj, validated_data, auth):
 
     def enable_or_disable_addon(self, obj, should_enable, addon_name, auth):
         """
-        Returns addon, if exists, otherwise returns None
+        Returns addon, if exists; otherwise, returns None
         """
         addon = obj.get_or_add_addon(addon_name, auth=auth) if should_enable else obj.delete_addon(addon_name, auth)
         if isinstance(addon, bool):
diff --git a/api/nodes/views.py b/api/nodes/views.py
index 8e5352f6f30..36a31c97c67 100644
--- a/api/nodes/views.py
+++ b/api/nodes/views.py
@@ -109,6 +109,7 @@
     DraftRegistrationDetailLegacySerializer,
     NodeContributorsSerializer,
     NodeContributorDetailSerializer,
+    NodeContributorsUpdateSerializer,
     NodeInstitutionsRelationshipSerializer,
     NodeContributorsCreateSerializer,
     NodeViewOnlyLinkSerializer,
@@ -239,7 +240,7 @@ def get_draft(self, draft_id=None, check_object_permissions=True):
 
 
 class NodeList(JSONAPIBaseView, bulk_views.BulkUpdateJSONAPIView, bulk_views.BulkDestroyJSONAPIView, bulk_views.ListBulkCreateJSONAPIView, NodesFilterMixin, WaterButlerMixin, NodeOptimizationMixin):
-    """The documentation for this endpoint can be found [here](https://developer.osf.io/#operation/nodes_list).
+    """See [documentation for this endpoint](https://developer.osf.io/#operation/nodes_list).
     """
     permission_classes = (
         drf_permissions.IsAuthenticatedOrReadOnly,
@@ -361,7 +362,7 @@ def perform_destroy(self, instance):
 
 
 class NodeDetail(JSONAPIBaseView, generics.RetrieveUpdateDestroyAPIView, NodeMixin, WaterButlerMixin):
-    """The documentation for this endpoint can be found [here](https://developer.osf.io/#operation/nodes_read).
+    """See [documentation for this endpoint](https://developer.osf.io/#operation/nodes_read).
     """
     permission_classes = (
         drf_permissions.IsAuthenticatedOrReadOnly,
@@ -410,7 +411,7 @@ def get_renderer_context(self):
 
 
 class NodeContributorsList(BaseContributorList, bulk_views.BulkUpdateJSONAPIView, bulk_views.BulkDestroyJSONAPIView, bulk_views.ListBulkCreateJSONAPIView, NodeMixin):
-    """The documentation for this endpoint can be found [here](https://developer.osf.io/#operation/nodes_contributors_list).
+    """See [documentation for this endpoint](https://developer.osf.io/#operation/nodes_contributors_list).
     """
     permission_classes = (
         AdminOrPublic,
@@ -434,11 +435,16 @@ class NodeContributorsList(BaseContributorList, bulk_views.BulkUpdateJSONAPIView
     def get_resource(self):
         return self.get_node()
 
+    def get_object(self):
+        return self.get_node()
+
     # overrides ListBulkCreateJSONAPIView, BulkUpdateJSONAPIView, BulkDeleteJSONAPIView
     def get_serializer_class(self):
         """
         Use NodeContributorDetailSerializer which requires 'id'
         """
+        if self.request.method == 'PATCH' and self.request.query_params.get('copy_contributors_from_parent_project'):
+            return NodeContributorsUpdateSerializer
         if self.request.method == 'PUT' or self.request.method == 'PATCH' or self.request.method == 'DELETE':
             return NodeContributorDetailSerializer
         elif self.request.method == 'POST':
@@ -499,9 +505,21 @@ def get_serializer_context(self):
         context['default_email'] = 'default'
         return context
 
+    def patch(self, request, *args, **kwargs):
+        """
+        Override the default patch behavior to handle the special case
+        of updating contributors by copying contributors from the parent project.
+        """
+        if request.query_params.get('copy_contributors_from_parent_project'):
+            instance = self.get_object()
+            serializer = self.get_serializer_class()(instance, data=request.data)
+            serializer.is_valid(raise_exception=True)
+            serializer.save()
+            return Response(serializer.data, status=200)
+        return super().patch(request, *args, **kwargs)
 
 class NodeContributorDetail(BaseContributorDetail, generics.RetrieveUpdateDestroyAPIView, NodeMixin, UserMixin):
-    """The documentation for this endpoint can be found [here](https://developer.osf.io/#operation/nodes_contributors_read).
+    """See [documentation for this endpoint](https://developer.osf.io/#operation/nodes_contributors_read).
     """
     permission_classes = (
         ContributorDetailPermissions,
@@ -619,7 +637,7 @@ def get_default_queryset(self):
 
 class NodeDraftRegistrationsList(JSONAPIBaseView, generics.ListCreateAPIView, NodeMixin):
     """
-    The documentation for this endpoint can be found [here](https://developer.osf.io/#operation/nodes_draft_registrations_list).
+    See [documentation for this endpoint](https://developer.osf.io/#operation/nodes_draft_registrations_list).
     This endpoint supports the older registries submission workflow and will soon be deprecated.
     Use DraftRegistrationsList endpoint instead.
     """
@@ -656,7 +674,7 @@ def get_queryset(self):
 
 class NodeDraftRegistrationDetail(JSONAPIBaseView, generics.RetrieveUpdateDestroyAPIView, DraftMixin):
     """
-    The documentation for this endpoint can be found [here](https://developer.osf.io/#operation/nodes_draft_registrations_read).
+    See [documentation for this endpoint](https://developer.osf.io/#operation/nodes_draft_registrations_read).
     This endpoint supports the older registries submission workflow and will soon be deprecated.
     Use DraftRegistrationDetail endpoint instead.
     """
@@ -688,7 +706,7 @@ def perform_destroy(self, draft):
 
 
 class NodeRegistrationsList(JSONAPIBaseView, generics.ListCreateAPIView, NodeMixin, DraftMixin):
-    """The documentation for this endpoint can be found [here](https://developer.osf.io/#operation/nodes_registrations_list).
+    """See [documentation for this endpoint](https://developer.osf.io/#operation/nodes_registrations_list).
     """
     permission_classes = (
         AdminContributorOrPublic,
@@ -737,7 +755,7 @@ def perform_create(self, serializer):
 
 
 class NodeChildrenList(BaseChildrenList, bulk_views.ListBulkCreateJSONAPIView, NodeMixin):
-    """The documentation for this endpoint can be found [here](https://developer.osf.io/#operation/nodes_children_list).
+    """See [documentation for this endpoint](https://developer.osf.io/#operation/nodes_children_list).
     """
 
     required_read_scopes = [CoreScopes.NODE_CHILDREN_READ]
@@ -770,7 +788,7 @@ def perform_create(self, serializer):
 
 
 class NodeCitationDetail(JSONAPIBaseView, generics.RetrieveAPIView, NodeMixin):
-    """The documentation for this endpoint can be found [here](https://developer.osf.io/#operation/nodes_citation_list).
+    """See [documentation for this endpoint](https://developer.osf.io/#operation/nodes_citation_list).
     """
     permission_classes = (
         drf_permissions.IsAuthenticatedOrReadOnly,
@@ -792,7 +810,7 @@ def get_object(self):
         return node.csl
 
 class NodeCitationStyleDetail(JSONAPIBaseView, generics.RetrieveAPIView, NodeMixin):
-    """ The documentation for this endpoint can be found [here](https://developer.osf.io/#operation/nodes_citation_read).
+    """ See [documentation for this endpoint](https://developer.osf.io/#operation/nodes_citation_read).
     """
     permission_classes = (
         drf_permissions.IsAuthenticatedOrReadOnly,
@@ -1005,7 +1023,7 @@ def perform_destroy(self, instance):
 
 
 class NodeForksList(JSONAPIBaseView, generics.ListCreateAPIView, NodeMixin, NodesFilterMixin):
-    """The documentation for this endpoint can be found [here](https://developer.osf.io/#operation/nodes_forks_list).
+    """See [documentation for this endpoint](https://developer.osf.io/#operation/nodes_forks_list).
     """
     permission_classes = (
         IsPublic,
@@ -1108,7 +1126,7 @@ def get_queryset(self):
 
 
 class NodeFilesList(JSONAPIBaseView, generics.ListAPIView, WaterButlerMixin, ListFilterMixin, NodeMixin):
-    """The documentation for this endpoint can be found [here](https://developer.osf.io/#operation/nodes_files_list).
+    """See [documentation for this endpoint](https://developer.osf.io/#operation/nodes_files_list).
 
     """
     permission_classes = (
@@ -1152,7 +1170,7 @@ def postprocess_query_param(self, key, field_name, operation):
         if field_name == 'path':
             operation['source_field_name'] = '_path'
         # NOTE: This is potentially fragile, if we ever add filtering on provider
-        # we're going to have to get a bit tricky. get_default_queryset should ramain filtering on BaseFileNode, for now
+        # we're going to have to get a bit tricky. get_default_queryset should retain filtering on BaseFileNode, for now
         if field_name == 'kind':
             if operation['value'].lower() == 'folder':
                 kind = Folder
@@ -1209,7 +1227,7 @@ def get_queryset(self):
 
 
 class NodeFileDetail(JSONAPIBaseView, generics.RetrieveAPIView, WaterButlerMixin, NodeMixin):
-    """The documentation for this endpoint can be found [here](https://developer.osf.io/#operation/nodes_files_read).
+    """See [documentation for this endpoint](https://developer.osf.io/#operation/nodes_files_read).
     """
     permission_classes = (
         drf_permissions.IsAuthenticatedOrReadOnly,
@@ -1248,7 +1266,7 @@ def get_object(self):
 
 
 class NodeAddonList(JSONAPIBaseView, generics.ListAPIView, ListFilterMixin, NodeMixin, AddonSettingsMixin):
-    """The documentation for this endpoint can be found [here](https://developer.osf.io/#operation/nodes_addons_list).
+    """See [documentation for this endpoint](https://developer.osf.io/#operation/nodes_addons_list).
 
     """
 
@@ -1283,7 +1301,7 @@ def get_default_queryset(self):
 
 
 class NodeAddonDetail(JSONAPIBaseView, generics.RetrieveUpdateDestroyAPIView, generics.CreateAPIView, NodeMixin, AddonSettingsMixin):
-    """The documentation for this endpoint can be found [here](https://developer.osf.io/#operation/nodes_addon_read).
+    """See [documentation for this endpoint](https://developer.osf.io/#operation/nodes_addon_read).
     """
 
     permission_classes = (
@@ -1336,7 +1354,7 @@ def get_serializer_class(self):
 
 
 class NodeAddonFolderList(JSONAPIBaseView, generics.ListAPIView, NodeMixin, AddonSettingsMixin):
-    """The documentation for this endpoint can be found [here](https://developer.osf.io/#operation/nodes_addons_folders_list).
+    """See [documentation for this endpoint](https://developer.osf.io/#operation/nodes_addons_folders_list).
     """
     permission_classes = (
         drf_permissions.IsAuthenticatedOrReadOnly,
@@ -1426,7 +1444,7 @@ def root_folder(self):
 
 
 class NodeStorageProvidersList(JSONAPIBaseView, generics.ListAPIView, NodeMixin):
-    """The documentation for this endpoint can be found [here](https://developer.osf.io/#operation/nodes_providers_list).
+    """See [documentation for this endpoint](https://developer.osf.io/#operation/nodes_providers_list).
     """
     permission_classes = (
         drf_permissions.IsAuthenticatedOrReadOnly,
@@ -1461,7 +1479,7 @@ def get_queryset(self):
 
 
 class NodeStorageProviderDetail(JSONAPIBaseView, generics.RetrieveAPIView, NodeMixin):
-    """The documentation for this endpoint can be found [here](https://developer.osf.io/#operation/nodes_providers_read).
+    """See [documentation for this endpoint](https://developer.osf.io/#operation/nodes_providers_read).
     """
     permission_classes = (
         drf_permissions.IsAuthenticatedOrReadOnly,
@@ -1483,7 +1501,7 @@ def get_object(self):
 
 
 class NodeLogList(JSONAPIBaseView, generics.ListAPIView, NodeMixin, ListFilterMixin):
-    """The documentation for this endpoint can be found [here](https://developer.osf.io/#operation/nodes_logs_list).
+    """See [documentation for this endpoint](https://developer.osf.io/#operation/nodes_logs_list).
     """
 
     serializer_class = NodeLogSerializer
@@ -1517,7 +1535,7 @@ def get_queryset(self):
 
 
 class NodeCommentsList(JSONAPIBaseView, generics.ListCreateAPIView, ListFilterMixin, NodeMixin):
-    """The documentation for this endpoint can be found [here](https://developer.osf.io/#operation/nodes_comments_list).
+    """See [documentation for this endpoint](https://developer.osf.io/#operation/nodes_comments_list).
     """
     permission_classes = (
         drf_permissions.IsAuthenticatedOrReadOnly,
@@ -1593,7 +1611,7 @@ def get_queryset(self):
 
 
 class NodeInstitutionsList(JSONAPIBaseView, generics.ListAPIView, ListFilterMixin, NodeMixin):
-    """The documentation for this endpoint can be found [here](https://developer.osf.io/#operation/nodes_institutions_list).
+    """See [documentation for this endpoint](https://developer.osf.io/#operation/nodes_institutions_list).
     """
     permission_classes = (
         drf_permissions.IsAuthenticatedOrReadOnly,
@@ -1753,7 +1771,7 @@ def retrieve(self, request, *args, **kwargs):
 
 
 class NodeSubjectsList(BaseResourceSubjectsList, NodeMixin):
-    """The documentation for this endpoint can be found [here](https://developer.osf.io/#operation/nodes_subjects_list).
+    """See [documentation for this endpoint](https://developer.osf.io/#operation/nodes_subjects_list).
     """
     permission_classes = (
         drf_permissions.IsAuthenticatedOrReadOnly,
@@ -1772,7 +1790,7 @@ def get_resource(self):
 
 
 class NodeSubjectsRelationship(SubjectRelationshipBaseView, NodeMixin):
-    """The documentation for this endpoint can be found [here](https://developer.osf.io/#operation/node_subjects_relationship).
+    """See [documentation for this endpoint](https://developer.osf.io/#operation/node_subjects_relationship).
     """
     permission_classes = (
         drf_permissions.IsAuthenticatedOrReadOnly,
@@ -1794,7 +1812,7 @@ def get_resource(self, check_object_permissions=True):
 
 
 class NodeWikiList(JSONAPIBaseView, generics.ListCreateAPIView, NodeMixin, ListFilterMixin):
-    """The documentation for this endpoint can be found [here](https://developer.osf.io/#operation/nodes_wikis_list).
+    """See [documentation for this endpoint](https://developer.osf.io/#operation/nodes_wikis_list).
     """
 
     permission_classes = (
@@ -1870,7 +1888,7 @@ class NodeLinkedNodesRelationship(LinkedNodesRelationship, NodeMixin):
     node identifiers. This will replace the contents of the node_links for this collection with
     the contents of the request. It will delete all node links that don't have a node_id in the data
     array, create node links for the node_ids that don't currently have a node id, and do nothing
-    for node_ids that already have a corresponding node_link. This means a update request with
+    for node_ids that already have a corresponding node_link. This means an update request with
     {"data": []} will remove all node_links in this collection
 
     ###Destroy
@@ -1895,7 +1913,7 @@ class NodeLinkedNodesRelationship(LinkedNodesRelationship, NodeMixin):
 
 
 class LinkedNodesList(BaseLinkedList, NodeMixin):
-    """The documentation for this endpoint can be found [here](https://developer.osf.io/#operation/nodes_linked_nodes_list).
+    """See [documentation for this endpoint](https://developer.osf.io/#operation/nodes_linked_nodes_list).
     """
     serializer_class = NodeSerializer
     view_category = 'nodes'
@@ -1959,7 +1977,7 @@ class NodeLinkedRegistrationsRelationship(LinkedRegistrationsRelationship, NodeM
     node identifiers. This will replace the contents of the node_links for this node with
     the contents of the request. It will delete all node links that don't have a node_id in the data
     array, create node links for the node_ids that don't currently have a node id, and do nothing
-    for node_ids that already have a corresponding node_link. This means a update request with
+    for node_ids that already have a corresponding node_link. This means an update request with
     {"data": []} will remove all node_links in this node.
 
     ###Destroy
@@ -2065,7 +2083,7 @@ def get_parser_context(self, http_request):
 
 
 class NodeViewOnlyLinksList(JSONAPIBaseView, generics.ListCreateAPIView, ListFilterMixin, NodeMixin):
-    """The documentation for this endpoint can be found [here](https://developer.osf.io/#operation/nodes_view_only_links_list).
+    """See [documentation for this endpoint](https://developer.osf.io/#operation/nodes_view_only_links_list).
     """
     permission_classes = (
         IsAdmin,
@@ -2091,7 +2109,7 @@ def get_queryset(self):
 
 
 class NodeViewOnlyLinkDetail(JSONAPIBaseView, generics.RetrieveUpdateDestroyAPIView, NodeMixin):
-    """The documentation for this endpoint can be found [here](https://developer.osf.io/#operation/nodes_view_only_links_read).
+    """See [documentation for this endpoint](https://developer.osf.io/#operation/nodes_view_only_links_read).
     """
 
     permission_classes = (
@@ -2128,7 +2146,7 @@ def perform_destroy(self, link):
         # enqueue_postcommit_task(ban_url, (self.get_node(),), {}, celery=False, once_per_request=True)
 
 class NodeIdentifierList(NodeMixin, IdentifierList):
-    """The documentation for this endpoint can be found [here](https://developer.osf.io/#operation/nodes_identifiers_list).
+    """See [documentation for this endpoint](https://developer.osf.io/#operation/nodes_identifiers_list).
     """
 
     serializer_class = NodeIdentifierSerializer
@@ -2159,7 +2177,7 @@ def get_node(self, check_object_permissions=True):
 
 
 class NodePreprintsList(JSONAPIBaseView, generics.ListAPIView, NodeMixin, PreprintFilterMixin):
-    """The documentation for this endpoint can be found [here](https://developer.osf.io/#operation/nodes_preprints_list).
+    """See [documentation for this endpoint](https://developer.osf.io/#operation/nodes_preprints_list).
     """
     permission_classes = (
         drf_permissions.IsAuthenticatedOrReadOnly,
@@ -2372,9 +2390,9 @@ def update(self, request, *args, **kwargs):
             node_id = node_pos.get('id')
 
             if node_order > len(node_relations) - 1:
-                errors.append(f"Item {node_id} has _order {node_order} which is higher than the list length.")
+                errors.append(f"Item {node_id} has _order {node_order} which exceeds the list length.")
             if node_order < 0:
-                errors.append(f"Item {node_id} has _order {node_order} which is lower than zero.")
+                errors.append(f"Item {node_id} has _order {node_order} which is less than zero.")
 
             try:
                 child_node_id = self.get_node(node_id=node_id).id
diff --git a/api/preprints/views.py b/api/preprints/views.py
index 147ca2faaab..38bcce4c3f1 100644
--- a/api/preprints/views.py
+++ b/api/preprints/views.py
@@ -91,7 +91,7 @@ def handle_request(self, request, method, *args, **kwargs):
         preprint = self.get_preprint(check_object_permissions=False)
         if PreprintOldVersionsImmutableMixin.is_edit_allowed(preprint):
             return method(request, *args, **kwargs)
-        message = f'User can not edit previous versions of a preprint: [_id={preprint._id}]'
+        message = f'User cannot edit previous versions of a preprint: [_id={preprint._id}]'
         sentry.log_message(message)
         raise Conflict(detail=message)
 
@@ -158,12 +158,16 @@ def get_preprint(self, check_object_permissions=True, ignore_404=False):
             or preprint.machine_state == ReviewStates.WITHDRAWN.value,
         )
         if not preprint_is_public and not user_is_contributor and not user_is_reviewer:
+            if preprint.is_pending_moderation:
+                raise PermissionDenied(
+                    detail='This preprint is pending moderation and is not yet publicly available.',
+                )
             raise NotFound
 
         return preprint
 
 class PreprintList(PreprintMetricsViewMixin, JSONAPIBaseView, generics.ListCreateAPIView, PreprintFilterMixin):
-    """The documentation for this endpoint can be found [here](https://developer.osf.io/#operation/preprints_list).
+    """See [documentation for this endpoint](https://developer.osf.io/#operation/preprints_list).
     """
     # These permissions are not checked for the list of preprints, permissions handled by the query
     permission_classes = (
@@ -202,7 +206,7 @@ def get_default_queryset(self):
         # Permissions on the list objects are handled by the query
         public_only = self.metrics_requested
         queryset = self.preprints_queryset(Preprint.objects.all(), auth_user, public_only=public_only)
-        # Use get_metrics_queryset to return an queryset with annotated metrics
+        # Use get_metrics_queryset to return a queryset with annotated metrics
         # iff ?metrics query param is present
         if self.metrics_requested:
             return self.get_metrics_queryset(queryset)
@@ -290,7 +294,7 @@ def create(self, request, *args, **kwargs):
 
 
 class PreprintDetail(PreprintOldVersionsImmutableMixin, PreprintMetricsViewMixin, JSONAPIBaseView, generics.RetrieveUpdateDestroyAPIView, PreprintMixin, WaterButlerMixin):
-    """The documentation for this endpoint can be found [here](https://developer.osf.io/#operation/preprints_read).
+    """See [documentation for this endpoint](https://developer.osf.io/#operation/preprints_read).
 
     Note: The resource now exposes a `versions` relationship pointing to
     `/v2/preprints/{preprint_id}/versions/` for listing or creating versions.
@@ -374,7 +378,7 @@ def get_object(self):
 
 
 class PreprintCitationDetail(PreprintOldVersionsImmutableMixin, JSONAPIBaseView, generics.RetrieveAPIView, PreprintMixin):
-    """The documentation for this endpoint can be found [here](https://developer.osf.io/#operation/preprints_citation_list).
+    """See [documentation for this endpoint](https://developer.osf.io/#operation/preprints_citation_list).
     """
     permission_classes = (
         drf_permissions.IsAuthenticatedOrReadOnly,
@@ -399,7 +403,7 @@ def get_object(self):
 
 
 class PreprintCitationStyleDetail(JSONAPIBaseView, generics.RetrieveAPIView, PreprintMixin):
-    """The documentation for this endpoint can be found [here](https://developer.osf.io/#operation/preprints_citation_read).
+    """See [documentation for this endpoint](https://developer.osf.io/#operation/preprints_citation_read).
     """
     permission_classes = (
         drf_permissions.IsAuthenticatedOrReadOnly,
@@ -600,7 +604,7 @@ def post(self, request, *args, **kwargs):
 
 
 class PreprintSubjectsList(BaseResourceSubjectsList, PreprintMixin):
-    """The documentation for this endpoint can be found [here](https://developer.osf.io/#operation/preprint_subjects_list).
+    """See [documentation for this endpoint](https://developer.osf.io/#operation/preprint_subjects_list).
     """
     permission_classes = (
         drf_permissions.IsAuthenticatedOrReadOnly,
@@ -620,7 +624,7 @@ def get_resource(self):
 
 
 class PreprintSubjectsRelationship(PreprintOldVersionsImmutableMixin, SubjectRelationshipBaseView, PreprintMixin):
-    """The documentation for this endpoint can be found [here](https://developer.osf.io/#operation/preprint_subjects_list).
+    """See [documentation for this endpoint](https://developer.osf.io/#operation/preprint_subjects_list).
     """
     permission_classes = (
         drf_permissions.IsAuthenticatedOrReadOnly,
@@ -814,7 +818,7 @@ def get_queryset(self):
 
 
 class PreprintInstitutionsList(JSONAPIBaseView, generics.ListAPIView, ListFilterMixin, PreprintMixin):
-    """The documentation for this endpoint can be found [here](https://developer.osf.io/#operation/preprint_institutions_list).
+    """See [documentation for this endpoint](https://developer.osf.io/#operation/preprint_institutions_list).
     """
     permission_classes = (
         drf_permissions.IsAuthenticatedOrReadOnly,
diff --git a/api/providers/tasks.py b/api/providers/tasks.py
index b8fb8e06233..3c35aa62d5b 100644
--- a/api/providers/tasks.py
+++ b/api/providers/tasks.py
@@ -529,7 +529,7 @@ def bulk_upload_create_draft_registration(auth, initiator, schema, node, data, p
             for contributor in contributor_set:
                 if initiator != contributor.user:
                     is_removed = draft.remove_contributor(contributor, auth)
-                    assert is_removed, 'Removal of an non-initiator contributor from the draft has failed'
+                    assert is_removed, 'Removal of a non-initiator contributor from the draft has failed'
             draft.save()
         assert len(draft.contributor_set.all()) == 1, 'Draft should only have one contributor upon creation.'
         # Remove the initiator from the citation list
diff --git a/api/providers/views.py b/api/providers/views.py
index 940d29f8a2f..85b33258a24 100644
--- a/api/providers/views.py
+++ b/api/providers/views.py
@@ -148,7 +148,7 @@ class RegistrationProviderList(GenericProviderList):
 
 
 class PreprintProviderList(PreprintMetricsViewMixin, GenericProviderList):
-    """The documentation for this endpoint can be found [here](https://developer.osf.io/#operation/preprint_provider_list).
+    """See [documentation for this endpoint](https://developer.osf.io/#operation/preprint_provider_list).
     """
 
     model_class = PreprintProvider
@@ -226,7 +226,7 @@ class RegistrationProviderDetail(GenericProviderDetail):
 
 
 class PreprintProviderDetail(GenericProviderDetail, generics.UpdateAPIView):
-    """The documentation for this endpoint can be found [here](https://developer.osf.io/#operation/preprint_provider_detail).
+    """See [documentation for this endpoint](https://developer.osf.io/#operation/preprint_provider_detail).
     """
     permission_classes = (
         drf_permissions.IsAuthenticatedOrReadOnly,
@@ -322,7 +322,7 @@ class RegistrationProviderSubjects(BaseProviderSubjects):
 
 
 class PreprintProviderSubjects(BaseProviderSubjects):
-    """The documentation for this endpoint can be found [here](https://developer.osf.io/#operation/preprint_provider_subjects_list).
+    """See [documentation for this endpoint](https://developer.osf.io/#operation/preprint_provider_subjects_list).
     """
     view_category = 'preprint-providers'
     provider_class = PreprintProvider  # Not actually the model being serialized, privatize to avoid issues
@@ -400,13 +400,13 @@ class PreprintProviderHighlightedSubjectList(GenericProviderHighlightedSubjectLi
 
 
 class GenericProviderLicenseList(LicenseList):
-    """The documentation for this endpoint can be found [here](https://developer.osf.io/#operation/preprint_provider_licenses_list)
+    """See [documentation for this endpoint](https://developer.osf.io/#operation/preprint_provider_licenses_list)
     """
     ordering = ()  # TODO: should be ordered once the frontend for selecting default licenses no longer relies on order
 
     def get_default_queryset(self):
         """
-        Returns provider.acceptable_licenses if they exist, otherwise returns all licenses.
+        Returns provider.acceptable_licenses if they exist; otherwise, returns all licenses.
         The provider's default_license is also included in the queryset if one exists.
         """
         provider = get_object_or_error(
@@ -447,7 +447,7 @@ class PreprintProviderLicenseList(GenericProviderLicenseList):
 
 
 class PreprintProviderPreprintList(JSONAPIBaseView, generics.ListAPIView, PreprintFilterMixin, ProviderMixin):
-    """The documentation for this endpoint can be found [here](https://developer.osf.io/#operation/preprint_providers_preprints_list).
+    """See [documentation for this endpoint](https://developer.osf.io/#operation/preprint_providers_preprints_list).
     """
     provider_class = PreprintProvider
     permission_classes = (
diff --git a/api/registrations/serializers.py b/api/registrations/serializers.py
index 786d76ddccb..1cd3c6d2f4c 100644
--- a/api/registrations/serializers.py
+++ b/api/registrations/serializers.py
@@ -179,7 +179,7 @@ class RegistrationSerializer(NodeSerializer):
         ),
     )
 
-    # Populated via annnotation
+    # Populated via annotation
     revision_state = HideIfWithdrawal(ser.CharField(read_only=True, required=False))
     has_data = HideIfWithdrawal(ser.BooleanField(read_only=True, required=False))
     has_analytic_code = HideIfWithdrawal(ser.BooleanField(read_only=True, required=False))
@@ -609,7 +609,7 @@ def check_perms(self, registration, user, validated_data):
         permissions through group membership.
 
         Additionally, provider_specific_metadata fields are only editable by
-        provder admins/moderators, but those users are not allowed to edit
+        provider admins/moderators, but those users are not allowed to edit
         any other fields.
 
         Add fields that need admin perms to admin_only_editable_fields
@@ -625,7 +625,7 @@ def check_perms(self, registration, user, validated_data):
             raise exceptions.PermissionDenied()
 
         # Fail if non-contributor moderator tries to edit
-        # fields other than provider_specific_metdata
+        # fields other than provider_specific_metadata
         if any(field != 'provider_specific_metadata' for field in validated_data) and not can_edit:
             raise exceptions.PermissionDenied()
 
diff --git a/api/registrations/views.py b/api/registrations/views.py
index b2026d5f4b8..368348c05f9 100644
--- a/api/registrations/views.py
+++ b/api/registrations/views.py
@@ -130,7 +130,7 @@ def get_node(self, check_object_permissions=True, **annotations):
 
 
 class RegistrationList(JSONAPIBaseView, generics.ListCreateAPIView, bulk_views.BulkUpdateJSONAPIView, NodesFilterMixin, DraftMixin):
-    """The documentation for this endpoint can be found [here](https://developer.osf.io/#operation/registrations_list).
+    """See [documentation for this endpoint](https://developer.osf.io/#operation/registrations_list).
     """
     permission_classes = (
         drf_permissions.IsAuthenticatedOrReadOnly,
@@ -236,7 +236,7 @@ def check_branched_from(self, draft):
 
 
 class RegistrationDetail(JSONAPIBaseView, generics.RetrieveUpdateAPIView, RegistrationMixin, WaterButlerMixin):
-    """The documentation for this endpoint can be found [here](https://developer.osf.io/#operation/registrations_read).
+    """See [documentation for this endpoint](https://developer.osf.io/#operation/registrations_read).
     """
     permission_classes = (
         drf_permissions.IsAuthenticatedOrReadOnly,
@@ -275,8 +275,8 @@ def get_serializer_context(self):
         return context
 
 
-class RegistrationContributorsList(BaseContributorList, mixins.CreateModelMixin, RegistrationMixin, UserMixin):
-    """The documentation for this endpoint can be found [here](https://developer.osf.io/#operation/registrations_contributors_list).
+class RegistrationContributorsList(BaseContributorList, bulk_views.BulkUpdateJSONAPIView, bulk_views.ListBulkCreateJSONAPIView, mixins.CreateModelMixin, RegistrationMixin, UserMixin):
+    """See [documentation for this endpoint](https://developer.osf.io/#operation/registrations_contributors_list).
     """
     view_category = 'registrations'
     view_name = 'registration-contributors'
@@ -311,6 +311,20 @@ def get_default_queryset(self):
         node = self.get_resource()
         return node.contributor_set.all().prefetch_related('user__guids')
 
+    def get_queryset(self):
+        queryset = self.get_queryset_from_request()
+        if is_bulk_request(self.request):
+            contrib_ids = []
+            for item in self.request.data:
+                try:
+                    contrib_ids.append(item['id'].split('-')[1])
+                except AttributeError:
+                    raise ValidationError('Contributor identifier not provided.')
+                except IndexError:
+                    raise ValidationError('Contributor identifier incorrectly formatted.')
+            queryset = queryset.filter(user__guids___id__in=contrib_ids)
+        return queryset
+
     def get_serializer_context(self):
         context = super().get_serializer_context()
         context['resource'] = self.get_resource()
@@ -319,7 +333,7 @@ def get_serializer_context(self):
 
 
 class RegistrationContributorDetail(BaseContributorDetail, mixins.UpdateModelMixin, mixins.DestroyModelMixin, RegistrationMixin, UserMixin):
-    """The documentation for this endpoint can be found [here](https://developer.osf.io/#operation/registrations_contributors_read).
+    """See [documentation for this endpoint](https://developer.osf.io/#operation/registrations_contributors_read).
     """
     view_category = 'registrations'
     view_name = 'registration-contributor-detail'
@@ -396,7 +410,7 @@ def get_queryset(self):
 
 
 class RegistrationChildrenList(BaseChildrenList, generics.ListAPIView, RegistrationMixin):
-    """The documentation for this endpoint can be found [here](https://developer.osf.io/#operation/registrations_children_list).
+    """See [documentation for this endpoint](https://developer.osf.io/#operation/registrations_children_list).
     """
     view_category = 'registrations'
     view_name = 'registration-children'
@@ -423,7 +437,7 @@ def get_queryset(self):
 
 
 class RegistrationCitationDetail(NodeCitationDetail, RegistrationMixin):
-    """The documentation for this endpoint can be found [here](https://developer.osf.io/#operation/registrations_citations_list).
+    """See [documentation for this endpoint](https://developer.osf.io/#operation/registrations_citations_list).
     """
     required_read_scopes = [CoreScopes.NODE_REGISTRATIONS_READ]
 
@@ -432,7 +446,7 @@ class RegistrationCitationDetail(NodeCitationDetail, RegistrationMixin):
 
 
 class RegistrationCitationStyleDetail(NodeCitationStyleDetail, RegistrationMixin):
-    """The documentation for this endpoint can be found [here](https://developer.osf.io/#operation/registrations_citation_read).
+    """See [documentation for this endpoint](https://developer.osf.io/#operation/registrations_citation_read).
     """
     required_read_scopes = [CoreScopes.NODE_REGISTRATIONS_READ]
 
@@ -441,13 +455,13 @@ class RegistrationCitationStyleDetail(NodeCitationStyleDetail, RegistrationMixin
 
 
 class RegistrationForksList(NodeForksList, RegistrationMixin):
-    """The documentation for this endpoint can be found [here](https://developer.osf.io/#operation/registrations_forks_list).
+    """See [documentation for this endpoint](https://developer.osf.io/#operation/registrations_forks_list).
     """
     view_category = 'registrations'
     view_name = 'registration-forks'
 
 class RegistrationCommentsList(NodeCommentsList, RegistrationMixin):
-    """The documentation for this endpoint can be found [here](https://developer.osf.io/#operation/registrations_comments_list).
+    """See [documentation for this endpoint](https://developer.osf.io/#operation/registrations_comments_list).
     """
     serializer_class = RegistrationCommentSerializer
     view_category = 'registrations'
@@ -461,14 +475,14 @@ def get_serializer_class(self):
 
 
 class RegistrationLogList(NodeLogList, RegistrationMixin):
-    """The documentation for this endpoint can be found [here](https://developer.osf.io/#operation/registrations_logs_list).
+    """See [documentation for this endpoint](https://developer.osf.io/#operation/registrations_logs_list).
     """
     view_category = 'registrations'
     view_name = 'registration-logs'
 
 
 class RegistrationStorageProvidersList(NodeStorageProvidersList, RegistrationMixin):
-    """The documentation for this endpoint can be found [here](https://developer.osf.io/#operation/registrations_providers_list).
+    """See [documentation for this endpoint](https://developer.osf.io/#operation/registrations_providers_list).
     """
     serializer_class = RegistrationStorageProviderSerializer
 
@@ -629,7 +643,7 @@ class RegistrationRegistrationsList(NodeRegistrationsList, RegistrationMixin):
 
 
 class RegistrationFilesList(NodeFilesList, RegistrationMixin):
-    """The documentation for this endpoint can be found [here](https://developer.osf.io/#operation/registrations_files_list).
+    """See [documentation for this endpoint](https://developer.osf.io/#operation/registrations_files_list).
     """
     view_category = 'registrations'
     view_name = 'registration-files'
@@ -639,7 +653,7 @@ class RegistrationFilesList(NodeFilesList, RegistrationMixin):
 
 
 class RegistrationFileDetail(NodeFileDetail, RegistrationMixin):
-    """The documentation for this endpoint can be found [here](https://developer.osf.io/#operation/registrations_files_read).
+    """See [documentation for this endpoint](https://developer.osf.io/#operation/registrations_files_read).
     """
     view_category = 'registrations'
     view_name = 'registration-file-detail'
@@ -647,14 +661,14 @@ class RegistrationFileDetail(NodeFileDetail, RegistrationMixin):
 
 
 class RegistrationInstitutionsList(NodeInstitutionsList, RegistrationMixin):
-    """The documentation for this endpoint can be found [here](https://developer.osf.io/#operation/registrations_institutions_list).
+    """See [documentation for this endpoint](https://developer.osf.io/#operation/registrations_institutions_list).
     """
     view_category = 'registrations'
     view_name = 'registration-institutions'
 
 
 class RegistrationSubjectsList(NodeSubjectsList, RegistrationMixin):
-    """The documentation for this endpoint can be found [here](https://developer.osf.io/#operation/registrations_subjects_list).
+    """See [documentation for this endpoint](https://developer.osf.io/#operation/registrations_subjects_list).
     """
     view_category = 'registrations'
     view_name = 'registration-subjects'
@@ -663,7 +677,7 @@ class RegistrationSubjectsList(NodeSubjectsList, RegistrationMixin):
 
 
 class RegistrationSubjectsRelationship(NodeSubjectsRelationship, RegistrationMixin):
-    """The documentation for this endpoint can be found [here](https://developer.osf.io/#operation/registrations_subjects_relationship).
+    """See [documentation for this endpoint](https://developer.osf.io/#operation/registrations_subjects_relationship).
     """
 
     required_read_scopes = [CoreScopes.NODE_REGISTRATIONS_READ]
@@ -674,7 +688,7 @@ class RegistrationSubjectsRelationship(NodeSubjectsRelationship, RegistrationMix
 
 
 class RegistrationInstitutionsRelationship(NodeInstitutionsRelationship, RegistrationMixin):
-    """The documentation for this endpoint can be found [here](https://developer.osf.io/#operation/registrations_institutions_relationship).
+    """See [documentation for this endpoint](https://developer.osf.io/#operation/registrations_institutions_relationship).
     """
     view_category = 'registrations'
     view_name = 'registration-relationships-institutions'
@@ -687,7 +701,7 @@ class RegistrationInstitutionsRelationship(NodeInstitutionsRelationship, Registr
 
 
 class RegistrationWikiList(NodeWikiList, RegistrationMixin):
-    """The documentation for this endpoint can be found [here](https://developer.osf.io/#operation/registrations_wikis_list).
+    """See [documentation for this endpoint](https://developer.osf.io/#operation/registrations_wikis_list).
     """
     view_category = 'registrations'
     view_name = 'registration-wikis'
@@ -696,7 +710,7 @@ class RegistrationWikiList(NodeWikiList, RegistrationMixin):
 
 
 class RegistrationLinkedNodesList(LinkedNodesList, RegistrationMixin):
-    """The documentation for this endpoint can be found [here](https://developer.osf.io/#operation/registrations_linked_nodes_list).
+    """See [documentation for this endpoint](https://developer.osf.io/#operation/registrations_linked_nodes_list).
     """
     view_category = 'registrations'
     view_name = 'linked-nodes'
@@ -850,7 +864,7 @@ class RegistrationLinkedRegistrationsList(NodeLinkedRegistrationsList, Registrat
 
 
 class RegistrationViewOnlyLinksList(NodeViewOnlyLinksList, RegistrationMixin):
-    """The documentation for this endpoint can be found [here](https://developer.osf.io/#operation/registrations_view_only_links_list).
+    """See [documentation for this endpoint](https://developer.osf.io/#operation/registrations_view_only_links_list).
     """
     required_read_scopes = [CoreScopes.REGISTRATION_VIEW_ONLY_LINKS_READ]
     required_write_scopes = [CoreScopes.REGISTRATION_VIEW_ONLY_LINKS_WRITE]
@@ -860,7 +874,7 @@ class RegistrationViewOnlyLinksList(NodeViewOnlyLinksList, RegistrationMixin):
 
 
 class RegistrationViewOnlyLinkDetail(NodeViewOnlyLinkDetail, RegistrationMixin):
-    """The documentation for this endpoint can be found [here](https://developer.osf.io/#operation/registrations_view_only_links_read).
+    """See [documentation for this endpoint](https://developer.osf.io/#operation/registrations_view_only_links_read).
     """
     required_read_scopes = [CoreScopes.REGISTRATION_VIEW_ONLY_LINKS_READ]
     required_write_scopes = [CoreScopes.REGISTRATION_VIEW_ONLY_LINKS_WRITE]
@@ -870,7 +884,7 @@ class RegistrationViewOnlyLinkDetail(NodeViewOnlyLinkDetail, RegistrationMixin):
 
 
 class RegistrationIdentifierList(RegistrationMixin, NodeIdentifierList):
-    """The documentation for this endpoint can be found [here](https://developer.osf.io/#operation/registrations_identifiers_list).
+    """See [documentation for this endpoint](https://developer.osf.io/#operation/registrations_identifiers_list).
     """
 
     serializer_class = RegistrationIdentifierSerializer
@@ -918,7 +932,7 @@ def perform_create(self, serializer):
         self.check_object_permissions(self.request, target)
 
         if not target.provider.is_reviewed:
-            raise Conflict(f'{target.provider.name} is an umoderated provider. If you believe this is an error, contact OSF Support.')
+            raise Conflict(f'{target.provider.name} is an unmoderated provider. If you believe this is an error, contact OSF Support.')
 
         serializer.save(user=self.request.user)
 
@@ -1087,7 +1101,7 @@ def update(self, request, *args, **kwargs):
                     errors=errors,
                 )
             else:
-                # Dataverse requires two seperate targets, one
+                # Dataverse requires two separate targets, one
                 # for draft files and one for published files
                 if src_provider == 'dataverse':
                     src_provider += '-' + (payload['destination']['name'].split(' ')[-1].lstrip('(').rstrip(')').strip())
diff --git a/api/schema_responses/views.py b/api/schema_responses/views.py
index f8a74a19548..2d52922615d 100644
--- a/api/schema_responses/views.py
+++ b/api/schema_responses/views.py
@@ -73,7 +73,7 @@ def get_queryset(self):
 
     def get_parser_context(self, http_request):
         """
-        Tells parser what json schema we are checking againest.
+        Tells parser what json schema we are checking against.
         """
         res = super().get_parser_context(http_request)
         res['json_schema'] = self.create_payload_schema
diff --git a/api/schemas/views.py b/api/schemas/views.py
index 0f44646f7f5..4575ce7d034 100644
--- a/api/schemas/views.py
+++ b/api/schemas/views.py
@@ -16,7 +16,7 @@
 
 
 class RegistrationSchemaList(JSONAPIBaseView, generics.ListAPIView, ListFilterMixin):
-    """The documentation for this endpoint can be found [here](https://developer.osf.io/#operation/metaschemas_list).
+    """See [documentation for this endpoint](https://developer.osf.io/#operation/metaschemas_list).
 
     """
     permission_classes = (
@@ -42,7 +42,7 @@ def get_queryset(self):
 
 
 class RegistrationSchemaDetail(JSONAPIBaseView, generics.RetrieveAPIView):
-    """The documentation for this endpoint can be found [here](https://developer.osf.io/#operation/metaschemas_read).
+    """See [documentation for this endpoint](https://developer.osf.io/#operation/metaschemas_read).
     """
     permission_classes = (
         drf_permissions.IsAuthenticatedOrReadOnly,
diff --git a/api/search/views.py b/api/search/views.py
index 958c5907f3b..b8bf9fba3af 100644
--- a/api/search/views.py
+++ b/api/search/views.py
@@ -260,7 +260,7 @@ class SearchFiles(BaseSearchView):
     For an OSF File entity, the `type` is "files" regardless of whether the entity is actually a file or folder, because
     it belongs to the `files` collection of the API.  They can be distinguished by the `kind` attribute.  Files and
     folders use the same representation, but some attributes may be null for one kind but not the other. `size` will be
-    null for folders.  A list of storage provider keys can be found [here](/v2/#storage-providers).
+    null for folders.  See the [list of storage provider keys](/v2/#storage-providers).
 
         name                        type               description
         ================================================================================================================
@@ -284,8 +284,8 @@ class SearchFiles(BaseSearchView):
         md5                         string             md5 hash of file, null for folders
         sha256                      string             SHA-256 hash of file, null for folders
 
-    * A note on timestamps: for files stored in osfstorage, `date_created` refers to the time the file was
-    first uploaded to osfstorage, and `date_modified` is the time the file was last updated while in osfstorage.
+    * A note on timestamps: for files stored in osfstorage, `date_created` refers to the time that the file was
+    first uploaded to osfstorage, and `date_modified` is the time that the file was last updated while in osfstorage.
     Other providers may or may not provide this information, but if they do it will correspond to the provider's
     semantics for created/modified times.  These timestamps may also be stale; metadata retrieved via the File Detail
     endpoint is cached.  The `last_touched` field describes the last time the metadata was retrieved from the external
@@ -549,7 +549,7 @@ class SearchUsers(BaseSearchView):
 
     The User Detail endpoint retrieves information about the user whose id is the final part of the path.  If `me`
     is given as the id, the record of the currently logged-in user will be returned.  The returned information includes
-    the user's bibliographic information and the date the user registered.
+    the user's bibliographic information and the date that the user registered.
 
     Note that if an anonymous view_only key is being used, user information will not be serialized, and the id will be
     an empty string. Relationships to a user object will not show in this case, either.
diff --git a/api/subjects/views.py b/api/subjects/views.py
index 28ea766a573..3bd41fcf2f5 100644
--- a/api/subjects/views.py
+++ b/api/subjects/views.py
@@ -132,7 +132,7 @@ def postprocess_query_param(self, key, field_name, operation):
 
 
 class SubjectDetail(JSONAPIBaseView, generics.RetrieveAPIView, SubjectMixin):
-    """The documentation for this endpoint can be found [here](https://developer.osf.io/#operation/subjects_read).
+    """See [documentation for this endpoint](https://developer.osf.io/#operation/subjects_read).
     """
     permission_classes = (
         drf_permissions.IsAuthenticatedOrReadOnly,
@@ -151,7 +151,7 @@ def get_object(self):
 
 
 class SubjectChildrenList(JSONAPIBaseView, generics.ListAPIView, SubjectMixin, ListFilterMixin):
-    """The documentation for this endpoint can be found [here](https://developer.osf.io/#operation/subject_children_list).
+    """See [documentation for this endpoint](https://developer.osf.io/#operation/subject_children_list).
     """
     permission_classes = (
         drf_permissions.IsAuthenticatedOrReadOnly,
diff --git a/api/subscriptions/views.py b/api/subscriptions/views.py
index c1d7e833b49..6d7fbabe411 100644
--- a/api/subscriptions/views.py
+++ b/api/subscriptions/views.py
@@ -86,6 +86,26 @@ def get_object(self):
         self.check_object_permissions(self.request, obj)
         return obj
 
+    def update(self, request, *args, **kwargs):
+        ret = super().update(request, *args, **kwargs)
+        obj = self.get_object()
+        # Copy global_reviews subscription changes to new_pending_submissions subscriptions [ENG-9666]
+        if obj.event_name == 'global_reviews':
+            user = obj.user
+            qs = NotificationSubscription.objects.filter(
+                event_name='new_pending_submissions',
+            ).filter(
+                Q(none=user) |
+                Q(email_digest=user) |
+                Q(email_transactional=user),
+            ).distinct()
+            for subscription in qs:
+                data = {**request.data, 'id': subscription._id}
+                serializer = self.get_serializer(subscription, data=data)
+                serializer.is_valid(raise_exception=True)
+                self.perform_update(serializer)
+        return ret
+
 
 class AbstractProviderSubscriptionDetail(SubscriptionDetail):
     view_name = 'provider-notification-subscription-detail'
diff --git a/api/taxonomies/views.py b/api/taxonomies/views.py
index 2e421a3432b..e8f6d74d76b 100644
--- a/api/taxonomies/views.py
+++ b/api/taxonomies/views.py
@@ -13,7 +13,7 @@
 
 
 class TaxonomyList(DeprecatedView, JSONAPIBaseView, generics.ListAPIView, ListFilterMixin):
-    """The documentation for this endpoint can be found [here](https://developer.osf.io/#operation/taxonomies_list).
+    """See [documentation for this endpoint](https://developer.osf.io/#operation/taxonomies_list).
     """
     permission_classes = (
         drf_permissions.IsAuthenticatedOrReadOnly,
@@ -54,7 +54,7 @@ def postprocess_query_param(self, key, field_name, operation):
 
 
 class TaxonomyDetail(JSONAPIBaseView, generics.RetrieveAPIView):
-    """The documentation for this endpoint can be found [here](https://developer.osf.io/#operation/taxonomies_read).
+    """See [documentation for this endpoint](https://developer.osf.io/#operation/taxonomies_read).
     """
     permission_classes = (
         drf_permissions.IsAuthenticatedOrReadOnly,
diff --git a/api/users/urls.py b/api/users/urls.py
index 3184872707f..97ac4bb05b9 100644
--- a/api/users/urls.py
+++ b/api/users/urls.py
@@ -14,6 +14,7 @@
     re_path(r'^(?P<user_id>\w+)/addons/(?P<provider>\w+)/accounts/$', views.UserAddonAccountList.as_view(), name=views.UserAddonAccountList.view_name),
     re_path(r'^(?P<user_id>\w+)/addons/(?P<provider>\w+)/accounts/(?P<account_id>\w+)/$', views.UserAddonAccountDetail.as_view(), name=views.UserAddonAccountDetail.view_name),
     re_path(r'^(?P<user_id>\w+)/claim/$', views.ClaimUser.as_view(), name=views.ClaimUser.view_name),
+    re_path(r'^(?P<user_id>\w+)/confirm_claim/$', views.ConfirmClaimUser.as_view(), name=views.ConfirmClaimUser.view_name),
     re_path(r'^(?P<user_id>\w+)/confirm/$', views.ConfirmEmailView.as_view(), name=views.ConfirmEmailView.view_name),
     re_path(r'^(?P<user_id>\w+)/sanction_response/$', views.SanctionResponseView.as_view(), name=views.SanctionResponseView.view_name),
     re_path(r'^(?P<user_id>\w+)/draft_registrations/$', views.UserDraftRegistrations.as_view(), name=views.UserDraftRegistrations.view_name),
diff --git a/api/users/views.py b/api/users/views.py
index a35a5e9511f..de413053796 100644
--- a/api/users/views.py
+++ b/api/users/views.py
@@ -100,6 +100,7 @@
     OSFUser,
     Email,
     Tag,
+    PreprintProvider,
 )
 from osf.utils.tokens import TokenHandler
 from osf.utils.tokens.handlers import sanction_handler
@@ -107,6 +108,8 @@
 from website.project.views.contributor import send_claim_email, send_claim_registered_email
 from website.util.metrics import CampaignClaimedTags, CampaignSourceTags
 from framework.auth import exceptions
+from website.project.views.contributor import _add_related_claimed_tag_to_user
+from website.util import api_v2_url
 
 
 class UserMixin:
@@ -165,7 +168,7 @@ def get_user(self, check_permissions=True):
 
 
 class UserList(JSONAPIBaseView, generics.ListAPIView, ListFilterMixin):
-    """The documentation for this endpoint can be found [here](https://developer.osf.io/#operation/users_list).
+    """See [documentation for this endpoint](https://developer.osf.io/#operation/users_list).
     """
     permission_classes = (
         drf_permissions.IsAuthenticatedOrReadOnly,
@@ -192,7 +195,7 @@ def get_queryset(self):
 
 
 class UserDetail(JSONAPIBaseView, generics.RetrieveUpdateAPIView, UserMixin):
-    """The documentation for this endpoint can be found [here](https://developer.osf.io/#operation/users_read).
+    """See [documentation for this endpoint](https://developer.osf.io/#operation/users_read).
     """
     permission_classes = (
         drf_permissions.IsAuthenticatedOrReadOnly,
@@ -228,7 +231,7 @@ def get_serializer_context(self):
 
 
 class UserAddonList(JSONAPIBaseView, generics.ListAPIView, ListFilterMixin, UserMixin):
-    """The documentation for this endpoint can be found [here](https://developer.osf.io/#operation/users_addons_list).
+    """See [documentation for this endpoint](https://developer.osf.io/#operation/users_addons_list).
     """
     permission_classes = (
         drf_permissions.IsAuthenticatedOrReadOnly,
@@ -252,7 +255,7 @@ def get_queryset(self):
 
 
 class UserAddonDetail(JSONAPIBaseView, generics.RetrieveAPIView, UserMixin, AddonSettingsMixin):
-    """The documentation for this endpoint can be found [here](https://developer.osf.io/#operation/users_addons_read).
+    """See [documentation for this endpoint](https://developer.osf.io/#operation/users_addons_read).
     """
     permission_classes = (
         drf_permissions.IsAuthenticatedOrReadOnly,
@@ -272,7 +275,7 @@ def get_object(self):
 
 
 class UserAddonAccountList(JSONAPIBaseView, generics.ListAPIView, UserMixin, AddonSettingsMixin):
-    """The documentation for this endpoint can be found [here](https://developer.osf.io/#operation/Users_addon_accounts_list).
+    """See [documentation for this endpoint](https://developer.osf.io/#operation/Users_addon_accounts_list).
     """
     permission_classes = (
         drf_permissions.IsAuthenticatedOrReadOnly,
@@ -293,7 +296,7 @@ def get_queryset(self):
         return self.get_addon_settings(check_object_permissions=False).external_accounts
 
 class UserAddonAccountDetail(JSONAPIBaseView, generics.RetrieveAPIView, UserMixin, AddonSettingsMixin):
-    """The documentation for this endpoint can be found [here](https://developer.osf.io/#operation/Users_addon_accounts_read).
+    """See [documentation for this endpoint](https://developer.osf.io/#operation/Users_addon_accounts_read).
     """
     permission_classes = (
         drf_permissions.IsAuthenticatedOrReadOnly,
@@ -319,7 +322,7 @@ def get_object(self):
 
 
 class UserNodes(JSONAPIBaseView, generics.ListAPIView, UserMixin, UserNodesFilterMixin, NodeOptimizationMixin):
-    """The documentation for this endpoint can be found [here](https://developer.osf.io/#operation/users_nodes_list).
+    """See [documentation for this endpoint](https://developer.osf.io/#operation/users_nodes_list).
     """
     permission_classes = (
         drf_permissions.IsAuthenticatedOrReadOnly,
@@ -358,7 +361,7 @@ def get_queryset(self):
 
 
 class UserPreprints(JSONAPIBaseView, generics.ListAPIView, UserMixin, PreprintFilterMixin):
-    """The documentation for this endpoint can be found [here](https://developer.osf.io/#operation/users_preprints_list).
+    """See [documentation for this endpoint](https://developer.osf.io/#operation/users_preprints_list).
     """
 
     permission_classes = (
@@ -393,7 +396,7 @@ def get_queryset(self):
 
 
 class UserDraftPreprints(JSONAPIBaseView, generics.ListAPIView, UserMixin, PreprintFilterMixin):
-    """The documentation for this endpoint can be found [here](https://developer.osf.io/).
+    """See [documentation for this endpoint](https://developer.osf.io/).
     """
 
     permission_classes = (
@@ -423,7 +426,7 @@ def get_queryset(self):
 
 
 class UserInstitutions(JSONAPIBaseView, generics.ListAPIView, UserMixin):
-    """The documentation for this endpoint can be found [here](https://developer.osf.io/#operation/users_institutions_list).
+    """See [documentation for this endpoint](https://developer.osf.io/#operation/users_institutions_list).
     """
     permission_classes = (
         drf_permissions.IsAuthenticatedOrReadOnly,
@@ -448,7 +451,7 @@ def get_queryset(self):
 
 
 class UserRegistrations(JSONAPIBaseView, generics.ListAPIView, UserMixin, NodesFilterMixin):
-    """The documentation for this endpoint can be found [here](https://developer.osf.io/#operation/users_registrations_list).
+    """See [documentation for this endpoint](https://developer.osf.io/#operation/users_registrations_list).
     """
     permission_classes = (
         drf_permissions.IsAuthenticatedOrReadOnly,
@@ -554,7 +557,7 @@ def perform_destroy(self, instance):
 
 class UserIdentitiesList(JSONAPIBaseView, generics.ListAPIView, UserMixin):
     """
-    The documentation for this endpoint can be found [here](https://developer.osf.io/#operation/external_identities_list).
+    See [documentation for this endpoint](https://developer.osf.io/#operation/external_identities_list).
     """
     permission_classes = (
         base_permissions.TokenHasScope,
@@ -582,7 +585,7 @@ def get_queryset(self):
 
 class UserIdentitiesDetail(JSONAPIBaseView, generics.RetrieveDestroyAPIView, UserMixin):
     """
-    The documentation for this endpoint can be found [here](https://developer.osf.io/#operation/external_identities_detail).
+    See [documentation for this endpoint](https://developer.osf.io/#operation/external_identities_detail).
     """
     permission_classes = (
         base_permissions.TokenHasScope,
@@ -1008,6 +1011,86 @@ def post(self, request, *args, **kwargs):
 
         return Response(status=status.HTTP_204_NO_CONTENT)
 
+class ConfirmClaimUser(JSONAPIBaseView, generics.CreateAPIView, UserMixin):
+
+    view_category = 'users'
+    view_name = 'confirm-claim-user'
+
+    def verify_claim_token(self, user, token, pid):
+        """View helper that checks that a claim token for a given user and node ID
+        is valid. If not valid, throws an error with custom error messages.
+        """
+        # if token is invalid, throw an error
+        if not user.verify_claim_token(token=token, project_id=pid):
+            if user.is_registered:
+                raise ValidationError('User has already been claimed.')
+            else:
+                return False
+        return True
+
+    def post(self, request, *args, **kwargs):
+        """
+        View for setting the password for a claimed user.
+        Sets the user's password.
+        HTTP Method: POST
+        **URL:**  /v2/users/<user_id>/confirm_claim/
+        **Body (JSON):**
+        {
+            "data": {
+                "type": "users",
+                "attributes": {
+                    "guid": "node/preprint guid",
+                    "token": "token",
+                    "password": "password",
+                    "accepted_terms_of_service": bool
+                }
+            }
+        }
+        """
+
+        uid = kwargs['user_id']
+        token = request.data.get('token')
+        guid = request.data.get('guid')
+        password = request.data.get('password')
+        accepted_terms_of_service = request.data.get('accepted_terms_of_service', False)
+        user = OSFUser.load(uid)
+
+        # If unregistered user is not in database, or url bears an invalid token raise HTTP 400 error
+        if not user or not self.verify_claim_token(user, token, guid):
+            raise ValidationError('Claim user does not exists, the token in the URL is invalid or has expired.')
+
+        # If user is logged in, need to use 'confirm_claim_registered' view
+        if request.user.is_authenticated:
+            raise ValidationError('You are already logged in. Please log out before trying to claim a user via this view.')
+
+        unclaimed_record = user.unclaimed_records[guid]
+        user.fullname = unclaimed_record['name']
+        user.update_guessed_names()
+        username = unclaimed_record.get('claimer_email') or unclaimed_record.get('email')
+
+        user.register(username=username, password=password, accepted_terms_of_service=accepted_terms_of_service)
+        # Clear unclaimed records
+        user.unclaimed_records = {}
+        user.verification_key = generate_verification_key()
+        user.save()
+        provider = PreprintProvider.load(guid)
+        redirect_url = None
+        if provider:
+            redirect_url = api_v2_url('auth_login', next=provider.landing_url, _absolute=True)
+        else:
+            # Add related claimed tags to user
+            _add_related_claimed_tag_to_user(guid, user)
+            redirect_url = api_v2_url('resolve_guid', guid=guid, _absolute=True)
+
+        data = {
+            'firstname': user.given_name,
+            'email': username if username else '',
+            'fullname': user.fullname,
+            'osf_contact_email': settings.OSF_CONTACT_EMAIL,
+            'next': redirect_url,
+        }
+
+        return Response(status=status.HTTP_200_OK, data=data)
 
 class ConfirmEmailView(generics.CreateAPIView):
     """
@@ -1023,7 +1106,7 @@ class ConfirmEmailView(generics.CreateAPIView):
     }
 
     On success returns a response with a 201 status code with a JSONAPI payload that includes the `redirect_url`
-    attritbute.
+    attribute.
     """
     permission_classes = (
         base_permissions.TokenHasScope,
diff --git a/api/view_only_links/views.py b/api/view_only_links/views.py
index a7c369bd349..0045c435fc5 100644
--- a/api/view_only_links/views.py
+++ b/api/view_only_links/views.py
@@ -18,7 +18,7 @@
 from osf.utils.permissions import ADMIN
 
 class ViewOnlyLinkDetail(JSONAPIBaseView, generics.RetrieveAPIView):
-    """The documentation for this endpoint can be found [here](https://developer.osf.io/#operation/view_only_links_read).
+    """See [documentation for this endpoint](https://developer.osf.io/#operation/view_only_links_read).
     """
     permission_classes = (
         base_permissions.TokenHasScope,
@@ -49,7 +49,7 @@ def get_object(self):
 
 
 class ViewOnlyLinkNodes(JSONAPIBaseView, generics.ListAPIView):
-    """The documentation for this endpoint can be found [here](https://developer.osf.io/#operation/view_only_links_node_list).
+    """See [documentation for this endpoint](https://developer.osf.io/#operation/view_only_links_node_list).
         """
     permission_classes = (
         base_permissions.TokenHasScope,
diff --git a/api/waffle/views.py b/api/waffle/views.py
index dfee83bc66e..3a5f32451b0 100644
--- a/api/waffle/views.py
+++ b/api/waffle/views.py
@@ -44,7 +44,7 @@ class WaffleList(JSONAPIBaseView, generics.ListAPIView):
     + `page=<Int>` -- page number of results to view, default 1
     + `flags=<>` -- comma-separated list of flag names
     + `switches=<>` -- comma-separated list of switch names
-    + `samples=<>` -- comman-separated list of sample names
+    + `samples=<>` -- comma-separated list of sample names
 
     #This Request/Response
 
diff --git a/api/wikis/views.py b/api/wikis/views.py
index 65500a21ba9..e9536ff3fdf 100644
--- a/api/wikis/views.py
+++ b/api/wikis/views.py
@@ -114,7 +114,7 @@ class WikiDetail(JSONAPIBaseView, generics.RetrieveUpdateDestroyAPIView, WikiMix
 
         self:  the canonical api endpoint of this wiki
         info: the canonical api endpoint of this wiki
-        download: the link to retrive the contents of the wiki page
+        download: the link to retrieve the contents of the wiki page
 
     ##Query Params
 
diff --git a/api_tests/applications/views/test_application_list.py b/api_tests/applications/views/test_application_list.py
index 76c1dd2246b..4759259aaf2 100644
--- a/api_tests/applications/views/test_application_list.py
+++ b/api_tests/applications/views/test_application_list.py
@@ -97,7 +97,7 @@ def test_created_applications_are_tied_to_request_user_with_data_specified(
         assert res.json['data']['attributes']['client_id'] != sample_data['data']['attributes']['client_id']
         assert res.json['data']['attributes']['client_secret'] != sample_data['data']['attributes']['client_secret']
 
-    def test_creating_application_fails_if_callbackurl_fails_validation(
+    def test_creating_application_fails_if_callback_url_fails_validation(
             self, app, user, url, sample_data):
         data = copy.copy(sample_data)
         data['data']['attributes']['callback_url'] = 'itunes:///invalid_url_of_doom'
diff --git a/api_tests/base/test_filters.py b/api_tests/base/test_filters.py
index 7a61a7d7c11..5e2bf61d689 100644
--- a/api_tests/base/test_filters.py
+++ b/api_tests/base/test_filters.py
@@ -552,12 +552,12 @@ def test_multiple_field_filter_non_match(self):
         match = self.filter_regex.match(filter_str)
         assert not match
 
-    def test_single_field_filter_non_match(self):
-        filter_str = 'fitler[name]'
+    def test_single_field_filter_misspelled(self):
+        filter_str = 'filter_[name]'
         match = self.filter_regex.match(filter_str)
         assert not match
 
     def test_single_field_non_alphanumeric_character(self):
-        filter_str = 'fitler[<name>]'
+        filter_str = 'filter[<name>]'
         match = self.filter_regex.match(filter_str)
         assert not match
diff --git a/api_tests/base/test_views.py b/api_tests/base/test_views.py
index 41e983b5afa..2d6b029b6ba 100644
--- a/api_tests/base/test_views.py
+++ b/api_tests/base/test_views.py
@@ -19,6 +19,7 @@
 )
 from api.users.views import (
     ClaimUser,
+    ConfirmClaimUser,
     ResetPassword,
     ExternalLoginConfirmEmailView,
     ExternalLogin,
@@ -60,6 +61,7 @@ class TestApiBaseViews(ApiTestCase):
     def setUp(self):
         super().setUp()
         self.EXCLUDED_VIEWS = [
+            ConfirmClaimUser,
             ClaimUser,
             CopyFileMetadataView,
             CountedAuthUsageView,
diff --git a/api_tests/collections/test_views.py b/api_tests/collections/test_views.py
index 025060cc4ee..cc04bb729f8 100644
--- a/api_tests/collections/test_views.py
+++ b/api_tests/collections/test_views.py
@@ -2768,7 +2768,7 @@ def test_return_bulk_deleted_collection_node_pointer(
         pointer_url = '/{}collections/{}/node_links/{}/'.format(
             API_BASE, collection_two._id, collection_two_pointer_one._id)
 
-        # check that deleted pointer can not be returned
+        # check that deleted pointer cannot be returned
         res = app.get(pointer_url, auth=user_one.auth, expect_errors=True)
         assert res.status_code == 404
 
diff --git a/api_tests/draft_registrations/views/test_draft_registration_contributor_list.py b/api_tests/draft_registrations/views/test_draft_registration_contributor_list.py
index 71fe7450b6d..9ab3c89bcfa 100644
--- a/api_tests/draft_registrations/views/test_draft_registration_contributor_list.py
+++ b/api_tests/draft_registrations/views/test_draft_registration_contributor_list.py
@@ -330,6 +330,30 @@ def url_private(self, project_private):
         return '/{}draft_registrations/{}/contributors/?send_email=false'.format(
             API_BASE, project_private._id)
 
+    def test_bulk_post_new_contributors(
+        self, app, user, project_public, payload_one, payload_two, url_public
+    ):
+        res = app.post_json_api(
+            url_public,
+            {'data': [payload_one, payload_two]},
+            auth=user.auth,
+            bulk=True,
+        )
+        assert res.status_code == 201
+        assert len(res.json['data']) == 2
+        assert [
+            res.json['data'][0]['attributes']['bibliographic'],
+            res.json['data'][1]['attributes']['bibliographic'],
+        ] == [True, False]
+        assert [
+            res.json['data'][0]['attributes']['permission'],
+            res.json['data'][1]['attributes']['permission'],
+        ] == [permissions.ADMIN, permissions.READ]
+        assert res.content_type == 'application/vnd.api+json'
+
+        res = app.get(url_public, auth=user.auth)
+        assert len(res.json['data']) == 3
+
 
 class TestDraftContributorBulkUpdated(DraftRegistrationCRUDTestCase, TestNodeContributorBulkUpdate):
 
@@ -376,6 +400,32 @@ def url_private(self, project_private):
         return '/{}draft_registrations/{}/contributors/'.format(
             API_BASE, project_private._id)
 
+    def test_bulk_patch_existing_contributors(
+        self, app, user, project_public, payload_public_one, payload_public_two, url_public
+    ):
+        res = app.patch_json_api(
+            url_public,
+            {'data': [payload_public_one, payload_public_two]},
+            auth=user.auth,
+            bulk=True,
+        )
+        assert res.status_code == 200
+        assert len(res.json['data']) == 2
+        assert [
+            res.json['data'][0]['attributes']['bibliographic'],
+            res.json['data'][1]['attributes']['bibliographic'],
+        ] == [True, False]
+        assert [
+            res.json['data'][0]['attributes']['permission'],
+            res.json['data'][1]['attributes']['permission'],
+        ] == [permissions.ADMIN, permissions.WRITE]
+
+        res = app.get(url_public, auth=user.auth)
+        data = res.json['data']
+        contrib_dict = {contrib['id']: contrib for contrib in data}
+        assert contrib_dict[payload_public_one['id']]['attributes']['permission'] == permissions.ADMIN
+        assert contrib_dict[payload_public_two['id']]['attributes']['permission'] == permissions.WRITE
+
 class TestDraftRegistrationContributorBulkPartialUpdate(DraftRegistrationCRUDTestCase, TestNodeContributorBulkPartialUpdate):
     @pytest.fixture()
     def project_public(
diff --git a/api_tests/files/views/test_file_cedar_metdata_record.py b/api_tests/files/views/test_file_cedar_metadata_record.py
similarity index 100%
rename from api_tests/files/views/test_file_cedar_metdata_record.py
rename to api_tests/files/views/test_file_cedar_metadata_record.py
diff --git a/api_tests/files/views/test_file_cedar_metadata_record_list.py b/api_tests/files/views/test_file_cedar_metadata_record_list.py
index 11e7c5b1aa3..e4143657867 100644
--- a/api_tests/files/views/test_file_cedar_metadata_record_list.py
+++ b/api_tests/files/views/test_file_cedar_metadata_record_list.py
@@ -1,6 +1,6 @@
 import pytest
 
-from .test_file_cedar_metdata_record import TestFileCedarMetadataRecord
+from .test_file_cedar_metadata_record import TestFileCedarMetadataRecord
 from osf.utils.permissions import ADMIN, READ, WRITE
 from osf_tests.factories import AuthUserFactory
 
diff --git a/api_tests/files/views/test_file_list.py b/api_tests/files/views/test_file_list.py
index 512ad0402a8..1ec35953b2f 100644
--- a/api_tests/files/views/test_file_list.py
+++ b/api_tests/files/views/test_file_list.py
@@ -84,7 +84,7 @@ def test_does_not_return_trashed_files(
     @responses.activate
     def test_disambiguate_dataverse_paths_initial(self, app, user, node, dataverse):
         '''
-        This test is for retrieving files from Dataverse initially, (Osf is contacting Dataverse after a update to their
+        This test is for retrieving files from Dataverse initially, (Osf is contacting Dataverse after an update to their
         Dataverse files) this test ensures both files are made into OSF filenodes and their `extra` info is passed along
         to the front-end.
         '''
@@ -133,7 +133,7 @@ def test_disambiguate_dataverse_paths_initial(self, app, user, node, dataverse):
     def test_disambiguate_dataverse_paths_retrieve(self, app, user, node, dataverse, dataverse_draft_filenode, dataverse_published_filenode):
         '''
         This test is for retrieving files from Dataverse and disambiguating their corresponding OSF filenodes and
-        ensures their `extra` info is passed along to the front-end. Waterbulter must also be mocked here, otherwise OSF
+        ensures their `extra` info is passed along to the front-end. Waterbutler must also be mocked here; otherwise, OSF
         will assume the files are gone.
         '''
         prepare_mock_wb_response(
diff --git a/api_tests/guids/views/test_guid_detail.py b/api_tests/guids/views/test_guid_detail.py
index 604f5a114d2..4a6db0fbc35 100644
--- a/api_tests/guids/views/test_guid_detail.py
+++ b/api_tests/guids/views/test_guid_detail.py
@@ -4,6 +4,7 @@
 from api.base.settings.defaults import API_BASE
 from osf_tests.factories import (
     AuthUserFactory,
+    PreprintFactory,
     ProjectFactory,
     RegistrationFactory,
     CommentFactory,
@@ -28,6 +29,18 @@ def project(self):
     def registration(self):
         return RegistrationFactory()
 
+    @pytest.fixture()
+    def versioned_preprint(self, user):
+        preprint = PreprintFactory(reviews_workflow='pre-moderation')
+        PreprintFactory.create_version(
+            create_from=preprint,
+            creator=user,
+            final_machine_state='accepted',
+            is_published=True,
+            set_doi=False
+        )
+        return preprint
+
     def test_redirects(self, app, project, registration, user):
         # test_redirect_to_node_view
         url = f'/{API_BASE}guids/{project._id}/'
@@ -125,6 +138,38 @@ def test_redirects_through_view_only_link(self, app, project, user):
         assert res.status_code == 302
         assert res.location == redirect_url
 
+    def test_redirects_with_version_for_versionable_objects(self, app, versioned_preprint, user):
+        # if you go to the guids endpoint with just the guid without version number
+        url = f'/{API_BASE}guids/{versioned_preprint.versioned_guids.first().guid._id}/'
+        res = app.get(url, auth=user.auth)
+        redirect_url = f'{API_DOMAIN}{API_BASE}preprints/{versioned_preprint.versioned_guids.first().guid._id}_v2/'
+        assert res.status_code == 302
+        assert res.location == redirect_url
+
+        # if you go to the guids endpoint with just the guid with a version number
+        url = f'/{API_BASE}guids/{versioned_preprint.versioned_guids.first().guid._id}_v2/'
+        res = app.get(url, auth=user.auth)
+        redirect_url = f'{API_DOMAIN}{API_BASE}preprints/{versioned_preprint.versioned_guids.first().guid._id}_v2/'
+        assert res.status_code == 302
+        assert res.location == redirect_url
+
+        url = f'/{API_BASE}guids/{versioned_preprint.versioned_guids.first().guid._id}_v1/'
+        res = app.get(url, auth=user.auth)
+        redirect_url = f'{API_DOMAIN}{API_BASE}preprints/{versioned_preprint.versioned_guids.first().guid._id}_v1/'
+        assert res.status_code == 302
+        assert res.location == redirect_url
+
+        url = f'/{API_BASE}guids/{versioned_preprint.versioned_guids.first().guid._id}_v3/'
+        res = app.get(url, auth=user.auth, expect_errors=True)
+        assert res.status_code == 404
+
+    def test_redirects_with_version_for_unversionable_objects(self, app, project, user):
+        url = f'/{API_BASE}guids/{project._id}_v12/'
+        res = app.get(url, auth=user.auth, expect_errors=True)
+        redirect_url = f'{API_DOMAIN}{API_BASE}nodes/{project._id}/'
+        assert res.status_code == 302
+        assert res.location == redirect_url
+
     def test_resolves(self, app, project, user):
         # test_resolve_query_param
         url = '{}{}guids/{}/?resolve=false'.format(
diff --git a/api_tests/identifiers/management_commands/__init__.py b/api_tests/identifiers/management_commands/__init__.py
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/api_tests/identifiers/managment_commands/test_sync_dois.py b/api_tests/identifiers/management_commands/test_sync_dois.py
similarity index 100%
rename from api_tests/identifiers/managment_commands/test_sync_dois.py
rename to api_tests/identifiers/management_commands/test_sync_dois.py
diff --git a/api_tests/institutions/views/test_institution_auth.py b/api_tests/institutions/views/test_institution_auth.py
index 11c187fbff6..fb8fc14f215 100644
--- a/api_tests/institutions/views/test_institution_auth.py
+++ b/api_tests/institutions/views/test_institution_auth.py
@@ -484,7 +484,7 @@ def test_user_external_unconfirmed(self, app, institution, url_auth_institution)
 
         user = OSFUser.objects.filter(username=username).first()
         assert user
-        # User remains untouched, including affiliation, external identity email verifcaitons
+        # User remains untouched, including affiliation, external identity email verifications
         assert user.fullname == fullname
         assert user.given_name == 'Foo'
         assert user.family_name == 'Bar'
@@ -596,9 +596,9 @@ def test_multiple_names_warning_new_user(self, app, institution, url_auth_instit
 
     def test_multiple_emails_failure_existing_user(self, app, institution, url_auth_institution):
         username, second_email, fullname, password = 'user_mefeu_a', 'user_mefeu_b@user.edu', 'Fake User', 'FuAsKeEr'
-        existing_uesr = make_user(username, fullname)
-        existing_uesr.set_password(password)
-        existing_uesr.save()
+        existing_user = make_user(username, fullname)
+        existing_user.set_password(password)
+        existing_user.save()
         sso_email = f'{username};{second_email}'
         with capture_signals() as mock_signals:
             res = app.post(
diff --git a/api_tests/institutions/views/test_institution_department_list.py b/api_tests/institutions/views/test_institution_department_list.py
index f2a335eed85..c2a5c0fcf99 100644
--- a/api_tests/institutions/views/test_institution_department_list.py
+++ b/api_tests/institutions/views/test_institution_department_list.py
@@ -1,4 +1,3 @@
-import time
 import pytest
 import datetime
 
@@ -7,7 +6,8 @@
     InstitutionFactory,
     AuthUserFactory,
 )
-from osf.metrics import UserInstitutionProjectCounts
+from osf.metrics.reports import InstitutionalUserReport
+from osf.metrics.utils import YearMonth
 
 
 @pytest.mark.es_metrics
@@ -37,50 +37,55 @@ def user4(self):
     @pytest.fixture()
     def populate_counts(self, user, user2, user3, user4, admin, institution):
         # This represents a Department that had a user, but no longer has any users, so does not appear in results.
-        UserInstitutionProjectCounts.record(
+        InstitutionalUserReport(
+            report_yearmonth=YearMonth(2017, 2),
             user_id=user._id,
             institution_id=institution._id,
-            department='Old Department',
+            department_name='Old Department',
             public_project_count=1,
             private_project_count=1,
-            timestamp=datetime.date(2017, 2, 4)
-        ).save()
+        ).save(refresh=True)
+
+        _this_month = YearMonth.from_date(datetime.date.today())
 
         # The user has left the department
-        UserInstitutionProjectCounts.record(
+        InstitutionalUserReport(
+            report_yearmonth=_this_month,
             user_id=user._id,
             institution_id=institution._id,
-            department='New Department',
+            department_name='New Department',
             public_project_count=1,
             private_project_count=1,
-        ).save()
+        ).save(refresh=True)
 
         # A second user entered the department
-        UserInstitutionProjectCounts.record(
+        InstitutionalUserReport(
+            report_yearmonth=_this_month,
             user_id=user2._id,
             institution_id=institution._id,
-            department='New Department',
+            department_name='New Department',
             public_project_count=1,
-            private_project_count=1
-        ).save()
+            private_project_count=1,
+        ).save(refresh=True)
 
         # A new department with a single user to test sorting
-        UserInstitutionProjectCounts.record(
+        InstitutionalUserReport(
+            report_yearmonth=_this_month,
             user_id=user3._id,
             institution_id=institution._id,
-            department='Smaller Department',
+            department_name='Smaller Department',
             public_project_count=1,
-            private_project_count=1
-        ).save()
+            private_project_count=1,
+        ).save(refresh=True)
 
         # A user with no department
-        UserInstitutionProjectCounts.record(
+        InstitutionalUserReport(
+            report_yearmonth=_this_month,
             user_id=user4._id,
             institution_id=institution._id,
             public_project_count=1,
-            private_project_count=1
-        ).save()
-        time.sleep(5)  # ES is slow
+            private_project_count=1,
+        ).save(refresh=True)
 
     @pytest.fixture()
     def admin(self, institution):
@@ -117,23 +122,23 @@ def test_get(self, app, url, admin, institution, populate_counts):
                 'name': 'New Department',
                 'number_of_users': 2
             },
-            'links': {'self': f'http://localhost:8000/v2/institutions/{institution._id}/metrics/departments/'}
+            'links': {},
         }, {
-            'id': f'{institution._id}-Smaller-Department',
+            'id': f'{institution._id}-{DEFAULT_ES_NULL_VALUE}',
             'type': 'institution-departments',
             'attributes': {
-                'name': 'Smaller Department',
+                'name': DEFAULT_ES_NULL_VALUE,
                 'number_of_users': 1
             },
-            'links': {'self': f'http://localhost:8000/v2/institutions/{institution._id}/metrics/departments/'}
+            'links': {},
         }, {
-            'id': f'{institution._id}-{DEFAULT_ES_NULL_VALUE}',
+            'id': f'{institution._id}-Smaller-Department',
             'type': 'institution-departments',
             'attributes': {
-                'name': DEFAULT_ES_NULL_VALUE,
+                'name': 'Smaller Department',
                 'number_of_users': 1
             },
-            'links': {'self': f'http://localhost:8000/v2/institutions/{institution._id}/metrics/departments/'}
+            'links': {},
         }]
 
         # Tests CSV Export
@@ -148,33 +153,10 @@ def test_get(self, app, url, admin, institution, populate_counts):
         rows = response_body.split('\r\n')
         header_row = rows[0].split(',')
         new_department_row = rows[1].split(',')
-        smaller_department_row = rows[2].split(',')
-        na_row = rows[3].split(',')
-
-        assert header_row == ['id', 'name', 'number_of_users', 'type']
-        assert new_department_row == [f'{institution._id}-New-Department', 'New Department', '2', 'institution-departments']
-        assert smaller_department_row == [f'{institution._id}-Smaller-Department', 'Smaller Department', '1', 'institution-departments']
-        assert na_row == [f'{institution._id}-N/A', 'N/A', '1', 'institution-departments']
-
-    def test_pagination(self, app, url, admin, institution, populate_counts):
-        resp = app.get(f'{url}?filter[name]=New Department', auth=admin.auth)
-
-        assert resp.json['data'] == [{
-            'id': '{}-{}'.format(institution._id, 'New-Department'),
-            'type': 'institution-departments',
-            'attributes': {
-                'name': 'New Department',
-                'number_of_users': 2
-            },
-            'links': {'self': f'http://localhost:8000/v2/institutions/{institution._id}/metrics/departments/'}
-        }]
-
-        resp = app.get(f'{url}?page[size]=2', auth=admin.auth)
-        assert len(resp.json['data']) == 2
-        assert resp.json['links']['meta']['per_page'] == 2
-        assert resp.json['links']['meta']['total'] == 3
+        na_row = rows[2].split(',')
+        smaller_department_row = rows[3].split(',')
 
-        resp = app.get(f'{url}?page[size]=2&page=2', auth=admin.auth)
-        assert len(resp.json['data']) == 1
-        assert resp.json['links']['meta']['per_page'] == 2
-        assert resp.json['links']['meta']['total'] == 3
+        assert header_row == ['name', 'number_of_users']
+        assert new_department_row == ['New Department', '2']
+        assert smaller_department_row == ['Smaller Department', '1']
+        assert na_row == ['N/A', '1']
diff --git a/api_tests/institutions/views/test_institution_summary_metrics.py b/api_tests/institutions/views/test_institution_summary_metrics.py
index f1641ea923c..41983458d2e 100644
--- a/api_tests/institutions/views/test_institution_summary_metrics.py
+++ b/api_tests/institutions/views/test_institution_summary_metrics.py
@@ -1,8 +1,4 @@
 import pytest
-import datetime
-
-from waffle.testutils import override_flag
-from osf.metrics import InstitutionProjectCounts
 
 from api.base.settings.defaults import API_BASE
 from osf_tests.factories import (
@@ -10,102 +6,11 @@
     AuthUserFactory,
 )
 from osf.metrics.reports import InstitutionMonthlySummaryReport
-from osf import features
 
 
 @pytest.mark.es_metrics
 @pytest.mark.django_db
-class TestInstitutionSummaryMetrics:
-
-    @pytest.fixture()
-    def institution(self):
-        return InstitutionFactory()
-
-    @pytest.fixture()
-    def user(self):
-        return AuthUserFactory()
-
-    @pytest.fixture()
-    def admin(self, institution):
-        user = AuthUserFactory()
-        group = institution.get_group('institutional_admins')
-        group.user_set.add(user)
-        group.save()
-        return user
-
-    @pytest.fixture()
-    def url(self, institution):
-        return f'/{API_BASE}institutions/{institution._id}/metrics/summary/'
-
-    def test_get(self, app, url, institution, user, admin):
-        # Tests unauthenticated user
-        resp = app.get(url, expect_errors=True)
-        assert resp.status_code == 401
-
-        # Tests unauthorized user
-        resp = app.get(url, auth=user.auth, expect_errors=True)
-        assert resp.status_code == 403
-
-        # Record latest institutional metrics to ES
-        public_project_count_latest = 24
-        private_project_count_latest = 26
-        institution_user_count_latest = 9
-        timestamp_latest = datetime.datetime.now()
-
-        # Uses record to specify user_count
-        InstitutionProjectCounts.record(
-            institution_id=institution._id,
-            user_count=institution_user_count_latest,
-            public_project_count=public_project_count_latest,
-            private_project_count=private_project_count_latest,
-            timestamp=timestamp_latest
-        ).save()
-
-        # Record earlier institutional metrics to ES
-        public_project_count_early = 20
-        private_project_count_early = 18
-        institution_user_count_early = 4
-        timestamp_early = timestamp_latest - datetime.timedelta(days=1)
-
-        # Uses record to specify user_count
-        InstitutionProjectCounts.record(
-            institution_id=institution._id,
-            user_count=institution_user_count_early,
-            public_project_count=public_project_count_early,
-            private_project_count=private_project_count_early,
-            timestamp=timestamp_early
-        ).save()
-
-        import time
-        time.sleep(5)
-
-        # Tests authorized user with institution with metrics
-        resp = app.get(url, auth=admin.auth)
-        assert resp.status_code == 200
-
-        # Validates the summary metrics returned by the API
-        assert resp.json['data'] == {
-            'id': institution._id,
-            'type': 'institution-summary-metrics',
-            'attributes': {
-                'public_project_count': public_project_count_latest,
-                'private_project_count': private_project_count_latest,
-                'user_count': institution_user_count_latest
-            },
-            'links': {
-                'self': f'http://localhost:8000/v2/institutions/{institution._id}/metrics/summary/'
-            }
-        }
-
-
-@pytest.mark.es_metrics
-@pytest.mark.django_db
-class TestNewInstitutionSummaryMetricsList:
-    @pytest.fixture(autouse=True)
-    def _waffled(self):
-        with override_flag(features.INSTITUTIONAL_DASHBOARD_2024, active=True):
-            yield
-
+class TestInstitutionSummaryMetricsList:
     @pytest.fixture()
     def institution(self):
         return InstitutionFactory()
diff --git a/api_tests/institutions/views/test_institution_user_metric_list.py b/api_tests/institutions/views/test_institution_user_metric_list.py
index 3c0e1bf055f..ef9ea28b0bd 100644
--- a/api_tests/institutions/views/test_institution_user_metric_list.py
+++ b/api_tests/institutions/views/test_institution_user_metric_list.py
@@ -2,281 +2,23 @@
 import csv
 import json
 from io import StringIO
-from random import random
 from urllib.parse import urlencode
 
 import pytest
-from waffle.testutils import override_flag
 
-from api.base.settings.defaults import API_BASE, DEFAULT_ES_NULL_VALUE, REPORT_FILENAME_FORMAT
-import osf.features
+from api.base.settings.defaults import API_BASE, REPORT_FILENAME_FORMAT
 from osf_tests.factories import (
     InstitutionFactory,
     AuthUserFactory,
 )
 
-from osf.metrics import UserInstitutionProjectCounts
 from osf.metrics.reports import InstitutionalUserReport
 from osf.models import UserMessage
 
 
 @pytest.mark.es_metrics
 @pytest.mark.django_db
-class TestOldInstitutionUserMetricList:
-
-    @pytest.fixture(autouse=True)
-    def _waffled(self):
-        with override_flag(osf.features.INSTITUTIONAL_DASHBOARD_2024, active=False):
-            yield  # these tests apply only before institution dashboard improvements
-
-    @pytest.fixture()
-    def institution(self):
-        return InstitutionFactory()
-
-    @pytest.fixture()
-    def user(self):
-        user = AuthUserFactory()
-        user.fullname = user.fullname + ',a'
-        user.save()
-        return user
-
-    @pytest.fixture()
-    def user2(self):
-        return AuthUserFactory()
-
-    @pytest.fixture()
-    def user3(self):
-        return AuthUserFactory(fullname='Zedd')
-
-    @pytest.fixture()
-    def user4(self):
-        return AuthUserFactory()
-
-    @pytest.fixture()
-    def admin(self, institution):
-        user = AuthUserFactory()
-        group = institution.get_group('institutional_admins')
-        group.user_set.add(user)
-        group.save()
-        return user
-
-    @pytest.fixture()
-    def populate_counts(self, institution, user, user2):
-        # Old data that shouldn't appear in responses
-        UserInstitutionProjectCounts(
-            user_id=user._id,
-            institution_id=institution._id,
-            department='Biology dept',
-            public_project_count=4,
-            private_project_count=4,
-            timestamp=datetime.date(2019, 6, 4)
-        ).save(refresh=True)
-
-        # New data
-        UserInstitutionProjectCounts(
-            user_id=user._id,
-            institution_id=institution._id,
-            department='Biology dept',
-            public_project_count=6,
-            private_project_count=5,
-        ).save(refresh=True)
-
-        UserInstitutionProjectCounts(
-            user_id=user2._id,
-            institution_id=institution._id,
-            department='Psychology dept',
-            public_project_count=3,
-            private_project_count=2,
-        ).save(refresh=True)
-
-    @pytest.fixture()
-    def populate_more_counts(self, institution, user, user2, user3, populate_counts):
-        # Creates 9 more user records to test pagination with
-
-        users = []
-        for i in range(0, 8):
-            users.append(AuthUserFactory())
-
-        for test_user in users:
-            UserInstitutionProjectCounts(
-                user_id=test_user._id,
-                institution_id=institution._id,
-                department='Psychology dept',
-                public_project_count=int(10 * random()),
-                private_project_count=int(10 * random()),
-            ).save(refresh=True)
-
-        UserInstitutionProjectCounts(
-            user_id=user3._id,
-            institution_id=institution._id,
-            department='Psychology dept',
-            public_project_count=int(10 * random()),
-            private_project_count=int(10 * random()),
-        ).save(refresh=True)
-
-    @pytest.fixture()
-    def populate_na_department(self, institution, user4):
-        UserInstitutionProjectCounts(
-            user_id=user4._id,
-            institution_id=institution._id,
-            public_project_count=1,
-            private_project_count=1,
-        ).save(refresh=True)
-
-    @pytest.fixture()
-    def url(self, institution):
-        return f'/{API_BASE}institutions/{institution._id}/metrics/users/'
-
-    def test_auth(self, app, url, user, admin):
-
-        resp = app.get(url, expect_errors=True)
-        assert resp.status_code == 401
-
-        resp = app.get(url, auth=user.auth, expect_errors=True)
-        assert resp.status_code == 403
-
-        resp = app.get(url, auth=admin.auth)
-        assert resp.status_code == 200
-
-        assert resp.json['data'] == []
-
-    def test_get(self, app, url, user, user2, admin, institution, populate_counts):
-        resp = app.get(url, auth=admin.auth)
-
-        assert resp.json['data'] == [
-            {
-                'id': user._id,
-                'type': 'institution-users',
-                'attributes': {
-                    'user_name': user.fullname,
-                    'public_projects': 6,
-                    'private_projects': 5,
-                    'department': 'Biology dept'
-                },
-                'relationships': {
-                    'user': {
-                        'links': {
-                            'related': {
-                                'href': f'http://localhost:8000/v2/users/{user._id}/',
-                                'meta': {}
-                            }
-                        },
-                        'data': {
-                            'id': user._id,
-                            'type': 'users'
-                        }
-                    }
-                },
-                'links': {
-                    'self': f'http://localhost:8000/v2/institutions/{institution._id}/metrics/users/'
-                }
-            },
-            {
-                'id': user2._id,
-                'type': 'institution-users',
-                'attributes': {
-                    'user_name': user2.fullname,
-                    'public_projects': 3,
-                    'private_projects': 2,
-                    'department': 'Psychology dept'
-                },
-                'relationships': {
-                    'user': {
-                        'links': {
-                            'related': {
-                                'href': f'http://localhost:8000/v2/users/{user2._id}/',
-                                'meta': {}
-                            }
-                        },
-                        'data': {
-                            'id': user2._id,
-                            'type': 'users'
-                        }
-                    }
-                },
-                'links': {
-                    'self': f'http://localhost:8000/v2/institutions/{institution._id}/metrics/users/'
-                }
-            }
-        ]
-
-        # Tests CSV Export
-        headers = {
-            'accept': 'text/csv'
-        }
-        resp = app.get(url, auth=admin.auth, headers=headers)
-        assert resp.status_code == 200
-        assert resp.headers['Content-Type'] == 'text/csv; charset=utf-8'
-
-        response_body = resp.text
-
-        expected_response = [['id', 'user_name', 'public_projects', 'private_projects', 'type'],
-            [user._id, user.fullname, '6', '5', 'institution-users'],
-            [user2._id, user2.fullname, '3', '2', 'institution-users']]
-
-        with StringIO(response_body) as csv_file:
-            csvreader = csv.reader(csv_file, delimiter=',')
-            for index, row in enumerate(csvreader):
-                assert row == expected_response[index]
-
-    def test_filter(self, app, url, admin, populate_counts):
-        resp = app.get(f'{url}?filter[department]=Psychology dept', auth=admin.auth)
-        assert resp.json['data'][0]['attributes']['department'] == 'Psychology dept'
-
-    def test_sort_and_pagination(self, app, url, user, user2, user3, admin, populate_counts, populate_more_counts, institution):
-        resp = app.get(f'{url}?sort=user_name&page[size]=1&page=2', auth=admin.auth)
-        assert resp.status_code == 200
-        assert resp.json['links']['meta']['total'] == 11
-        resp = app.get(f'{url}?sort=user_name&page[size]=1&page=11', auth=admin.auth)
-        assert resp.json['data'][0]['attributes']['user_name'] == 'Zedd'
-        resp = app.get(f'{url}?sort=user_name&page=2', auth=admin.auth)
-        assert resp.json['links']['meta']['total'] == 11
-        assert resp.json['data'][-1]['attributes']['user_name'] == 'Zedd'
-
-    def test_filter_and_pagination(self, app, user, user2, user3, url, admin, populate_counts, populate_more_counts, institution):
-        resp = app.get(f'{url}?page=2', auth=admin.auth)
-        assert resp.json['links']['meta']['total'] == 11
-        assert resp.json['data'][0]['attributes']['user_name'] == 'Zedd'
-        resp = app.get(f'{url}?filter[user_name]=Zedd', auth=admin.auth)
-        assert resp.json['links']['meta']['total'] == 1
-        assert resp.json['data'][0]['attributes']['user_name'] == 'Zedd'
-
-    def test_filter_and_sort(self, app, url, user, user2, user3, admin, user4, populate_counts, populate_na_department, institution):
-        """
-        Testing for bug where sorting and filtering would throw 502.
-        :param app:
-        :param url:
-        :param admin:
-        :param populate_more_counts:
-        :return:
-        """
-        resp = app.get(f'{url}?page=1&page[size]=10&filter[department]={DEFAULT_ES_NULL_VALUE}&sort=user_name', auth=admin.auth)
-        assert resp.status_code == 200
-
-        data = resp.json['data']
-        assert len(data) == 1
-        assert resp.json['links']['meta']['total'] == 1
-        assert data[0]['id'] == user4._id
-
-        resp = app.get(f'{url}?page=1&page[size]=10&sort=department', auth=admin.auth)
-        assert resp.status_code == 200
-
-        data = resp.json['data']
-        assert len(data) == 3
-        assert resp.json['links']['meta']['total'] == 3
-        assert data[0]['attributes']['department'] == 'Biology dept'
-        assert data[1]['attributes']['department'] == 'N/A'
-        assert data[2]['attributes']['department'] == 'Psychology dept'
-
-
-@pytest.mark.es_metrics
-@pytest.mark.django_db
-class TestNewInstitutionUserMetricList:
-    @pytest.fixture(autouse=True)
-    def _waffled(self):
-        with override_flag(osf.features.INSTITUTIONAL_DASHBOARD_2024, active=True):
-            yield  # these tests apply only after institution dashboard improvements
-
+class TestInstitutionUserMetricList:
     @pytest.fixture()
     def institution(self):
         return InstitutionFactory()
diff --git a/api_tests/mailhog/test_mailhog.py b/api_tests/mailhog/test_mailhog.py
index e7720e96afa..3de81c303e2 100644
--- a/api_tests/mailhog/test_mailhog.py
+++ b/api_tests/mailhog/test_mailhog.py
@@ -26,7 +26,7 @@
 @pytest.mark.usefixtures('mock_send_grid')
 class TestMailHog:
 
-    def test_mailhog_recived_mail(self, mock_send_grid):
+    def test_mailhog_received_mail(self, mock_send_grid):
         with override_switch(features.ENABLE_MAILHOG, active=True):
             mailhog_v1 = f'{settings.MAILHOG_API_HOST}/api/v1/messages'
             mailhog_v2 = f'{settings.MAILHOG_API_HOST}/api/v2/messages'
@@ -53,7 +53,7 @@ def setUp(self):
 
         self.mock_send_grid = start_mock_send_grid(self)
 
-    def test_recived_confirmation(self):
+    def test_received_confirmation(self):
         url = api_url_for('register_user')
         name, email, password = fake.name(), fake_email(), 'underpressure'
         mailhog_v1 = f'{settings.MAILHOG_API_HOST}/api/v1/messages'
diff --git a/api_tests/metrics/test_parse_datetimes.py b/api_tests/metrics/test_parse_datetimes.py
index 14dbfddcaa0..df8ac0c50e2 100644
--- a/api_tests/metrics/test_parse_datetimes.py
+++ b/api_tests/metrics/test_parse_datetimes.py
@@ -55,7 +55,7 @@ def test_end_date_before_start_on_date_fails(self, mock_timezone, start_date, en
             assert True
 
     @mock.patch('api.metrics.utils.timezone.now')
-    def test_time_used_for_specifc_date_fails(self, mock_timezone, start_date, end_date):
+    def test_time_used_for_specific_date_fails(self, mock_timezone, start_date, end_date):
         mock_timezone.return_value = datetime(2019, 1, 4, tzinfo=timezone.utc)
         try:
             parse_datetimes({'on_date': f'{start_date}T01:01:01'})
diff --git a/api_tests/nodes/filters/test_filters.py b/api_tests/nodes/filters/test_filters.py
index 43c9d1e62b5..01c6f75f3ed 100644
--- a/api_tests/nodes/filters/test_filters.py
+++ b/api_tests/nodes/filters/test_filters.py
@@ -378,7 +378,7 @@ def test_node_list_date_filter(
         actual = [node['id'] for node in res.json['data']]
         assert set(expected) == set(actual)
 
-    #   test_date_fitler_lt
+    #   test_date_filter_lt
         res_url = f'{url}filter[date_created][lt]='
 
         expected = []
diff --git a/api_tests/nodes/views/test_node_cedar_metadata_record.py b/api_tests/nodes/views/test_node_cedar_metadata_record.py
index e6c787a6531..28cd21812d4 100644
--- a/api_tests/nodes/views/test_node_cedar_metadata_record.py
+++ b/api_tests/nodes/views/test_node_cedar_metadata_record.py
@@ -8,7 +8,7 @@
 
 
 @pytest.mark.django_db
-class TesNodeCedarMetadataRecord:
+class TestNodeCedarMetadataRecord:
 
     @pytest.fixture()
     def user(self):
diff --git a/api_tests/nodes/views/test_node_cedar_metadata_record_list.py b/api_tests/nodes/views/test_node_cedar_metadata_record_list.py
index 8dd33a99b75..89b047fb495 100644
--- a/api_tests/nodes/views/test_node_cedar_metadata_record_list.py
+++ b/api_tests/nodes/views/test_node_cedar_metadata_record_list.py
@@ -1,12 +1,12 @@
 import pytest
 
-from .test_node_cedar_metadata_record import TesNodeCedarMetadataRecord
+from .test_node_cedar_metadata_record import TestNodeCedarMetadataRecord
 from osf.utils.permissions import ADMIN, READ, WRITE
 from osf_tests.factories import AuthUserFactory
 
 
 @pytest.mark.django_db
-class TestNodeCedarMetadataRecordListPublicProject(TesNodeCedarMetadataRecord):
+class TestNodeCedarMetadataRecordListPublicProject(TestNodeCedarMetadataRecord):
 
     def test_record_list_no_auth(self, app, node_pub, cedar_record_for_node_pub, cedar_draft_record_for_node_pub):
 
@@ -64,7 +64,7 @@ def test_record_list_with_admin_auth(self, app, node_pub, cedar_record_for_node_
 
 
 @pytest.mark.django_db
-class TestNodeCedarMetadataRecordListPrivateProject(TesNodeCedarMetadataRecord):
+class TestNodeCedarMetadataRecordListPrivateProject(TestNodeCedarMetadataRecord):
 
     def test_record_list_no_auth(self, app, node):
 
diff --git a/api_tests/nodes/views/test_node_children_list.py b/api_tests/nodes/views/test_node_children_list.py
index c1375ed1cc7..72077eaca53 100644
--- a/api_tests/nodes/views/test_node_children_list.py
+++ b/api_tests/nodes/views/test_node_children_list.py
@@ -190,7 +190,7 @@ def test_node_children_related_counts(self, app, user, public_project):
         child = NodeFactory(parent=parent, creator=user_2, is_public=False, category='software')
         NodeFactory(parent=child, creator=user_2, is_public=False)
 
-        # child has one component. `user` can view due to implict admin perms
+        # child has one component. `user` can view due to implicit admin perms
         component_url = f'/{API_BASE}nodes/{child._id}/children/'
         res = app.get(component_url, auth=user.auth)
 
@@ -656,7 +656,7 @@ def test_bulk_creates_children_child_logged_in_write_contributor(
 
     def test_bulk_creates_children_and_sanitizes_html_logged_in_owner(
             self, app, user, project, url):
-        title = '<em>Reasoning</em> <strong>Aboot Projects</strong>'
+        title = '<em>Reasoning</em> <strong>About Projects</strong>'
         description = 'A <script>alert("super reasonable")</script> child'
 
         res = app.post_json_api(url, {
diff --git a/api_tests/nodes/views/test_node_contributors_detail_update.py b/api_tests/nodes/views/test_node_contributors_detail_update.py
index 0e183c97345..3321cce167f 100644
--- a/api_tests/nodes/views/test_node_contributors_detail_update.py
+++ b/api_tests/nodes/views/test_node_contributors_detail_update.py
@@ -32,6 +32,21 @@ def project(self, user, contrib):
         )
         return project
 
+    @pytest.fixture()
+    def component_project_and_parent_project(self, user, contrib):
+        # both need to be in same method to keep root same as parent
+        parent_project = ProjectFactory(creator=user)
+        parent_project.add_contributor(
+            contrib,
+            permissions=permissions.WRITE,
+            visible=True,
+            save=True
+        )
+        component_project = ProjectFactory(creator=user)
+        component_project.root = parent_project
+        component_project.save()
+        return component_project, parent_project
+
     @pytest.fixture()
     def url_creator(self, user, project):
         return f'/{API_BASE}nodes/{project._id}/contributors/{user._id}/'
@@ -414,3 +429,22 @@ def test_change_admin_self_with_other_admin(self, app, user, contrib, project, u
             attributes = res.json['data']['attributes']
             assert attributes['permission'] == permissions.WRITE
             assert project.get_permissions(user) == [permissions.READ, permissions.WRITE]
+
+    def test_update_component_project_with_parent_contributors(self, app, user, component_project_and_parent_project):
+        def exists_unique_parent_contributors(parent_project, component_project):
+            return parent_project.contributors.exclude(
+                id__in=component_project.contributors.values_list('id', flat=True)
+            ).exists()
+        component_project, parent_project = component_project_and_parent_project
+        assert exists_unique_parent_contributors(parent_project, component_project)
+        res = app.patch_json_api(
+            f'/{API_BASE}nodes/{component_project._id}/contributors/?copy_contributors_from_parent_project=true',
+            {
+                'data': {
+                    'type': 3
+                }
+            },
+            auth=user.auth
+        )
+        assert res.status_code == 200
+        assert not exists_unique_parent_contributors(parent_project, component_project)
diff --git a/api_tests/nodes/views/test_node_detail.py b/api_tests/nodes/views/test_node_detail.py
index 6b15bd48281..dca0eecd649 100644
--- a/api_tests/nodes/views/test_node_detail.py
+++ b/api_tests/nodes/views/test_node_detail.py
@@ -334,7 +334,7 @@ def test_node_shows_collected_in_relationship(self, app, user, project_public, u
         assert 'collected_in' in res.json['data']['relationships']
 
     def test_preprint_field(self, app, user, user_two, project_public, url_public):
-        # Returns true if project holds supplemental material for a preprint a user can view
+        # Returns true if project holds supplemental material for a preprint that a user can view
         # Published preprint, admin_contrib
         preprint = PreprintFactory(project=project_public, creator=user)
         res = app.get(url_public, auth=user.auth)
diff --git a/api_tests/nodes/views/test_node_detail_update.py b/api_tests/nodes/views/test_node_detail_update.py
index a3b9103d07e..318e95b00ca 100644
--- a/api_tests/nodes/views/test_node_detail_update.py
+++ b/api_tests/nodes/views/test_node_detail_update.py
@@ -134,7 +134,7 @@ def test_make_project_private_uncalculated_storage_limit(
     def test_make_project_private_over_storage_limit(
         self, app, url_public, project_public, user
     ):
-        # If the public node exceeds the the private storage limit
+        # If the public node exceeds the private storage limit
         key = cache_settings.STORAGE_USAGE_KEY.format(target_id=project_public._id)
         storage_usage_cache.set(key, (settings.STORAGE_LIMIT_PRIVATE + 1) * settings.GBs, settings.STORAGE_USAGE_CACHE_TIMEOUT)
         res = app.patch_json_api(url_public, {
diff --git a/api_tests/nodes/views/test_node_links_detail.py b/api_tests/nodes/views/test_node_links_detail.py
index 0ad22bd6a78..981c0a176cb 100644
--- a/api_tests/nodes/views/test_node_links_detail.py
+++ b/api_tests/nodes/views/test_node_links_detail.py
@@ -296,7 +296,7 @@ def test_return_deleted_public_node_pointer(
             public_project.reload()  # Update the model to reflect changes made by post request
             assert res.status_code == 204
 
-        # check that deleted pointer can not be returned
+        # check that deleted pointer cannot be returned
         res = app.get(public_url, auth=user.auth, expect_errors=True)
         assert res.status_code == 404
 
@@ -307,7 +307,7 @@ def test_return_deleted_private_node_pointer(
             private_project.reload()  # Update the model to reflect changes made by post request
             assert res.status_code == 204
 
-        # check that deleted pointer can not be returned
+        # check that deleted pointer cannot be returned
         res = app.get(private_url, auth=user.auth, expect_errors=True)
         assert res.status_code == 404
 
diff --git a/api_tests/nodes/views/test_node_links_list.py b/api_tests/nodes/views/test_node_links_list.py
index a244dc369db..739a7bf6c3f 100644
--- a/api_tests/nodes/views/test_node_links_list.py
+++ b/api_tests/nodes/views/test_node_links_list.py
@@ -1268,7 +1268,7 @@ def test_return_bulk_deleted_public_node_pointer(
             pointer_url = '/{}nodes/{}/node_links/{}/'.format(
                 API_BASE, public_project._id, public_pointer_one._id)
 
-            # check that deleted pointer can not be returned
+            # check that deleted pointer cannot be returned
             res = app.get(pointer_url, auth=user.auth, expect_errors=True)
             assert res.status_code == 404
 
@@ -1285,7 +1285,7 @@ def test_return_bulk_deleted_private_node_pointer(
             pointer_url = '/{}nodes/{}/node_links/{}/'.format(
                 API_BASE, private_project._id, private_pointer_one._id)
 
-            # check that deleted pointer can not be returned
+            # check that deleted pointer cannot be returned
             res = app.get(pointer_url, auth=user.auth, expect_errors=True)
             assert res.status_code == 404
 
diff --git a/api_tests/nodes/views/test_node_list.py b/api_tests/nodes/views/test_node_list.py
index bbfa7870050..ce26219bf23 100644
--- a/api_tests/nodes/views/test_node_list.py
+++ b/api_tests/nodes/views/test_node_list.py
@@ -1057,7 +1057,7 @@ def test_private_preprint_in_preprint_false_filter_results(
         assert res.status_code == 200
         assert private.node._id not in [each['id'] for each in res.json['data']]
 
-    def test_abandonded_preprint_in_preprint_true_filter_results(
+    def test_abandoned_preprint_in_preprint_true_filter_results(
             self, app, user_one, user_two):
         abandoned = PreprintFactory(
             creator=user_one,
@@ -1089,7 +1089,7 @@ def test_abandonded_preprint_in_preprint_true_filter_results(
         assert res.status_code == 200
         assert abandoned.node._id in [each['id'] for each in res.json['data']]
 
-    def test_abandonded_preprint_in_preprint_false_filter_results(
+    def test_abandoned_preprint_in_preprint_false_filter_results(
             self, app, user_one, user_two):
         abandoned = PreprintFactory(
             creator=user_one,
diff --git a/api_tests/nodes/views/test_node_reorder_components.py b/api_tests/nodes/views/test_node_reorder_components.py
index 5bfa2ac374b..8754153ade5 100644
--- a/api_tests/nodes/views/test_node_reorder_components.py
+++ b/api_tests/nodes/views/test_node_reorder_components.py
@@ -135,12 +135,12 @@ def test_reorder_component_invalid_order(
         payload_asc['data'][0]['attributes']['_order'] = -1
         res = app.patch_json_api(url, payload_asc, auth=admin_contrib.auth, expect_errors=True, bulk=True)
         assert res.status_code == 400
-        assert res.json['errors'][0]['detail'] == f'Item {payload_asc['data'][0]['id']} has _order -1 which is lower than zero.'
+        assert res.json['errors'][0]['detail'] == f'Item {payload_asc['data'][0]['id']} has _order -1 which is less than zero.'
 
         payload_asc['data'][0]['attributes']['_order'] = 5
         res = app.patch_json_api(url, payload_asc, auth=admin_contrib.auth, expect_errors=True, bulk=True)
         assert res.status_code == 400
-        assert res.json['errors'][0]['detail'] == f'Item {payload_asc['data'][0]['id']} has _order 5 which is higher than the list length.'
+        assert res.json['errors'][0]['detail'] == f'Item {payload_asc['data'][0]['id']} has _order 5 which exceeds the list length.'
 
     def test_reorder_multiple_components_same_order(
             self, app, project, admin_contrib, url, payload_asc
diff --git a/api_tests/nodes/views/test_node_settings.py b/api_tests/nodes/views/test_node_settings.py
index 4861e4d3035..5212b36e8eb 100644
--- a/api_tests/nodes/views/test_node_settings.py
+++ b/api_tests/nodes/views/test_node_settings.py
@@ -43,7 +43,7 @@ def non_contrib(self):
 
     def test_node_settings_detail(self, app, admin_contrib, non_contrib, write_contrib, url, project):
 
-        # non logged in uers can't access node settings
+        # non logged in users can't access node settings
         res = app.get(url, expect_errors=True)
         assert res.status_code == 401
 
diff --git a/api_tests/preprints/views/test_preprint_detail.py b/api_tests/preprints/views/test_preprint_detail.py
index 4b25ec7bf83..283f7029c9f 100644
--- a/api_tests/preprints/views/test_preprint_detail.py
+++ b/api_tests/preprints/views/test_preprint_detail.py
@@ -169,7 +169,7 @@ def test_embed_contributors(self, app, user, preprint):
 
     def test_return_affiliated_institutions(self, app, user, preprint, institution, url):
         """
-        Confirmation test for the the new preprint affiliated institutions feature
+        Confirmation test for the new preprint affiliated institutions feature
         """
         preprint.affiliated_institutions.add(institution)
         res = app.get(url)
diff --git a/api_tests/preprints/views/test_preprint_detail_update.py b/api_tests/preprints/views/test_preprint_detail_update.py
index 0b9e6f60496..a58e0fa91bd 100644
--- a/api_tests/preprints/views/test_preprint_detail_update.py
+++ b/api_tests/preprints/views/test_preprint_detail_update.py
@@ -778,7 +778,7 @@ def test_update_data_links(self, app, user, preprint, url):
         assert log.action == PreprintLog.UPDATE_DATA_LINKS
         assert log.params == {'user': user._id, 'preprint': preprint._id}
 
-        update_payload = build_preprint_update_payload(preprint._id, attributes={'data_links': 'maformed payload'})
+        update_payload = build_preprint_update_payload(preprint._id, attributes={'data_links': 'malformed payload'})
         res = app.patch_json_api(url, update_payload, auth=user.auth, expect_errors=True)
 
         assert res.status_code == 400
@@ -924,7 +924,7 @@ def test_update_prereg_links(self, app, user, preprint, url):
         assert log.action == PreprintLog.UPDATE_PREREG_LINKS
         assert log.params == {'user': user._id, 'preprint': preprint._id}
 
-        update_payload = build_preprint_update_payload(preprint._id, attributes={'prereg_links': 'maformed payload'})
+        update_payload = build_preprint_update_payload(preprint._id, attributes={'prereg_links': 'malformed payload'})
         res = app.patch_json_api(url, update_payload, auth=user.auth, expect_errors=True)
 
         assert res.status_code == 400
@@ -958,12 +958,12 @@ def test_update_prereg_link_info(self, app, user, preprint, url):
 
         update_payload = build_preprint_update_payload(
             preprint._id,
-            attributes={'prereg_link_info': 'maformed payload'}
+            attributes={'prereg_link_info': 'malformed payload'}
         )
         res = app.patch_json_api(url, update_payload, auth=user.auth, expect_errors=True)
 
         assert res.status_code == 400
-        assert res.json['errors'][0]['detail'] == '"maformed payload" is not a valid choice.'
+        assert res.json['errors'][0]['detail'] == '"malformed payload" is not a valid choice.'
 
     def test_update_has_coi_false_with_null_conflict_statement(self, app, user, preprint, url):
         update_payload = build_preprint_update_payload(
diff --git a/api_tests/preprints/views/test_preprint_list.py b/api_tests/preprints/views/test_preprint_list.py
index bfa0c44f043..79b65f57cd2 100644
--- a/api_tests/preprints/views/test_preprint_list.py
+++ b/api_tests/preprints/views/test_preprint_list.py
@@ -196,7 +196,7 @@ def test_withdrawn_preprints_list(self):
 
     def test_return_affiliated_institutions(self):
         """
-        Confirmation test for the the new preprint affiliated institutions feature
+        Confirmation test for the new preprint affiliated institutions feature
         """
         self.preprint.affiliated_institutions.add(self.institution)
         res = self.app.get(self.url)
@@ -371,7 +371,7 @@ def manual_guid_payload(self):
             'manual_guid': self.manual_guid,
         }
 
-    def test_fail_create_prerprint_with_manual_guid(self):
+    def test_fail_create_preprint_with_manual_guid(self):
         public_project_payload = build_preprint_create_payload(self.public_project._id, self.provider._id, attrs=self.manual_guid_payload)
         res = self.app.post_json_api(self.url, public_project_payload, auth=self.user.auth, expect_errors=True)
         assert res.status_code == 400
diff --git a/api_tests/providers/preprints/views/test_preprint_provider_licenses.py b/api_tests/providers/preprints/views/test_preprint_provider_licenses.py
index 4dd3465dfc4..34c7e55d966 100644
--- a/api_tests/providers/preprints/views/test_preprint_provider_licenses.py
+++ b/api_tests/providers/preprints/views/test_preprint_provider_licenses.py
@@ -53,7 +53,7 @@ def test_preprint_provider_has_a_default_license_but_no_acceptable_licenses(self
         assert res.json['links']['meta']['total'] == len(licenses)
         assert license_two._id in [item['id'] for item in res.json['data']]
 
-    def test_prerint_provider_has_acceptable_licenses_but_no_default(self, app, provider, licenses, license_one, license_two, license_three, url):
+    def test_preprint_provider_has_acceptable_licenses_but_no_default(self, app, provider, licenses, license_one, license_two, license_three, url):
         provider.licenses_acceptable.add(license_one, license_two)
         provider.default_license = None
         provider.save()
diff --git a/api_tests/providers/preprints/views/test_preprint_provider_moderator_list.py b/api_tests/providers/preprints/views/test_preprint_provider_moderator_list.py
index 8998d2a85ca..3a6825692de 100644
--- a/api_tests/providers/preprints/views/test_preprint_provider_moderator_list.py
+++ b/api_tests/providers/preprints/views/test_preprint_provider_moderator_list.py
@@ -129,7 +129,7 @@ def test_list_post_admin_success_email(self, mock_send_grid, app, url, nonmodera
 
     def test_list_moderators_alphabetically(self, app, url, admin, moderator, provider):
         admin.fullname = 'Alice Alisdottir'
-        moderator.fullname = 'Bob Bobsson'
+        moderator.fullname = 'Bob Bobson'
         new_mod = AuthUserFactory(fullname='Cheryl Cherylsdottir')
         provider.get_group('moderator').user_set.add(new_mod)
         admin.save()
diff --git a/api_tests/providers/preprints/views/test_preprint_provider_request_list.py b/api_tests/providers/preprints/views/test_preprint_provider_request_list.py
index 2fbe6c1bd9e..0fee67a1636 100644
--- a/api_tests/providers/preprints/views/test_preprint_provider_request_list.py
+++ b/api_tests/providers/preprints/views/test_preprint_provider_request_list.py
@@ -4,7 +4,7 @@
 from api_tests.requests.mixins import PreprintRequestTestMixin
 
 @pytest.mark.django_db
-class TestPreprintProviderWithdrawalRequstList(PreprintRequestTestMixin):
+class TestPreprintProviderWithdrawalRequestList(PreprintRequestTestMixin):
     def url(self, provider):
         return f'/{API_BASE}providers/preprints/{provider._id}/withdraw_requests/'
 
diff --git a/api_tests/registrations/views/test_regisatration_callbacks.py b/api_tests/registrations/views/test_registration_callbacks.py
similarity index 100%
rename from api_tests/registrations/views/test_regisatration_callbacks.py
rename to api_tests/registrations/views/test_registration_callbacks.py
diff --git a/api_tests/registrations/views/test_registration_cedar_metadata_record.py b/api_tests/registrations/views/test_registration_cedar_metadata_record.py
index 04edf2d5258..cc87f1ee10e 100644
--- a/api_tests/registrations/views/test_registration_cedar_metadata_record.py
+++ b/api_tests/registrations/views/test_registration_cedar_metadata_record.py
@@ -8,7 +8,7 @@
 
 
 @pytest.mark.django_db
-class TesRegistrationCedarMetadataRecord:
+class TestRegistrationCedarMetadataRecord:
 
     @pytest.fixture()
     def user(self):
diff --git a/api_tests/registrations/views/test_registration_cedar_metadata_record_list.py b/api_tests/registrations/views/test_registration_cedar_metadata_record_list.py
index 6adb7f5555a..23f2d89685f 100644
--- a/api_tests/registrations/views/test_registration_cedar_metadata_record_list.py
+++ b/api_tests/registrations/views/test_registration_cedar_metadata_record_list.py
@@ -1,12 +1,12 @@
 import pytest
 
-from .test_registration_cedar_metadata_record import TesRegistrationCedarMetadataRecord
+from .test_registration_cedar_metadata_record import TestRegistrationCedarMetadataRecord
 from osf.utils.permissions import ADMIN, READ, WRITE
 from osf_tests.factories import AuthUserFactory
 
 
 @pytest.mark.django_db
-class TestRegistrationCedarMetadataRecordList(TesRegistrationCedarMetadataRecord):
+class TestRegistrationCedarMetadataRecordList(TestRegistrationCedarMetadataRecord):
 
     def test_record_list_no_auth(self, app, registration, cedar_record_for_registration, cedar_draft_record_for_registration):
         resp = app.get(f'/v2/registrations/{registration._id}/cedar_metadata_records/')
diff --git a/api_tests/registrations/views/test_registration_contributors_list.py b/api_tests/registrations/views/test_registration_contributors_list.py
new file mode 100644
index 00000000000..6adce937082
--- /dev/null
+++ b/api_tests/registrations/views/test_registration_contributors_list.py
@@ -0,0 +1,150 @@
+import pytest
+
+from api.base.settings.defaults import API_BASE
+from osf_tests.factories import (
+    AuthUserFactory,
+    ProjectFactory,
+    RegistrationFactory,
+)
+from osf.utils import permissions
+
+
+@pytest.fixture()
+def user():
+    return AuthUserFactory()
+
+
+@pytest.mark.django_db
+class TestRegistrationContributorsList:
+
+    @pytest.fixture()
+    def user_two(self):
+        return AuthUserFactory()
+
+    @pytest.fixture()
+    def user_three(self):
+        return AuthUserFactory()
+
+    @pytest.fixture()
+    def project_public(self, user):
+        return ProjectFactory(
+            title='Public Project',
+            description='A public project',
+            category='data',
+            is_public=True,
+            creator=user,
+        )
+
+    @pytest.fixture()
+    def registration_public(self, project_public, user):
+        return RegistrationFactory(project=project_public, creator=user, is_public=True)
+
+    @pytest.fixture()
+    def url_public(self, registration_public):
+        return f'/{API_BASE}registrations/{registration_public._id}/contributors/?send_email=false'
+
+    @pytest.fixture()
+    def payload_one(self, user_two):
+        return {
+            'type': 'contributors',
+            'attributes': {'bibliographic': True, 'permission': permissions.ADMIN},
+            'relationships': {'users': {'data': {'id': user_two._id, 'type': 'users'}}},
+        }
+
+    @pytest.fixture()
+    def payload_two(self, user_three):
+        return {
+            'type': 'contributors',
+            'attributes': {'bibliographic': False, 'permission': permissions.READ},
+            'relationships': {
+                'users': {'data': {'id': user_three._id, 'type': 'users'}}
+            },
+        }
+
+    @pytest.fixture()
+    def make_contrib_id(self):
+        def contrib_id(registration_id, user_id):
+            return f'{registration_id}-{user_id}'
+        return contrib_id
+
+    @pytest.fixture()
+    def registration_with_contributors(self, project_public, user, user_two, user_three):
+        registration = RegistrationFactory(project=project_public, creator=user, is_public=True)
+
+        registration.add_contributor(
+            user_two, permissions=permissions.READ, visible=True, save=True
+        )
+        registration.add_contributor(
+            user_three, permissions=permissions.READ, visible=True, save=True
+        )
+        return registration
+
+    @pytest.fixture()
+    def url_with_contributors(self, registration_with_contributors):
+        return f'/{API_BASE}registrations/{registration_with_contributors._id}/contributors/'
+
+    @pytest.fixture()
+    def update_payload_one(self, user_two, registration_with_contributors, make_contrib_id):
+        return {
+            'id': make_contrib_id(registration_with_contributors._id, user_two._id),
+            'type': 'contributors',
+            'attributes': {'bibliographic': True, 'permission': permissions.ADMIN},
+        }
+
+    @pytest.fixture()
+    def update_payload_two(self, user_three, registration_with_contributors, make_contrib_id):
+        return {
+            'id': make_contrib_id(registration_with_contributors._id, user_three._id),
+            'type': 'contributors',
+            'attributes': {'bibliographic': False, 'permission': permissions.WRITE},
+        }
+
+    def test_bulk_post_new_contributors(
+        self, app, user, registration_public, payload_one, payload_two, url_public
+    ):
+        res = app.post_json_api(
+            url_public,
+            {'data': [payload_one, payload_two]},
+            auth=user.auth,
+            bulk=True,
+        )
+        assert res.status_code == 201
+        assert len(res.json['data']) == 2
+        assert [
+            res.json['data'][0]['attributes']['bibliographic'],
+            res.json['data'][1]['attributes']['bibliographic'],
+        ] == [True, False]
+        assert [
+            res.json['data'][0]['attributes']['permission'],
+            res.json['data'][1]['attributes']['permission'],
+        ] == [permissions.ADMIN, permissions.READ]
+        assert res.content_type == 'application/vnd.api+json'
+
+        res = app.get(url_public, auth=user.auth)
+        assert len(res.json['data']) == 3
+
+    def test_bulk_patch_existing_contributors(
+        self, app, user, registration_with_contributors, update_payload_one, update_payload_two, url_with_contributors
+    ):
+        res = app.patch_json_api(
+            url_with_contributors,
+            {'data': [update_payload_one, update_payload_two]},
+            auth=user.auth,
+            bulk=True,
+        )
+        assert res.status_code == 200
+        assert len(res.json['data']) == 2
+        assert [
+            res.json['data'][0]['attributes']['bibliographic'],
+            res.json['data'][1]['attributes']['bibliographic'],
+        ] == [True, False]
+        assert [
+            res.json['data'][0]['attributes']['permission'],
+            res.json['data'][1]['attributes']['permission'],
+        ] == [permissions.ADMIN, permissions.WRITE]
+
+        res = app.get(url_with_contributors, auth=user.auth)
+        data = res.json['data']
+        contrib_dict = {contrib['id']: contrib for contrib in data}
+        assert contrib_dict[update_payload_one['id']]['attributes']['permission'] == permissions.ADMIN
+        assert contrib_dict[update_payload_two['id']]['attributes']['permission'] == permissions.WRITE
diff --git a/api_tests/registrations/views/test_registration_detail.py b/api_tests/registrations/views/test_registration_detail.py
index 9112d0a3264..31ca67d2b04 100644
--- a/api_tests/registrations/views/test_registration_detail.py
+++ b/api_tests/registrations/views/test_registration_detail.py
@@ -1243,7 +1243,7 @@ def test_get_provider_metadata_additional_metadata_never_set(self, app, provider
         expected_metadata = [{'field_name': 'foo', 'field_value': ''}]
         assert resp.json['data']['attributes']['provider_specific_metadata'] == expected_metadata
 
-    def test_get_provider_metadata_no_addtional_fields_or_additional_metadata(self, app):
+    def test_get_provider_metadata_no_additional_fields_or_additional_metadata(self, app):
         provider = RegistrationProviderFactory()
         registration = RegistrationFactory()
         registration.provider = provider
@@ -1266,7 +1266,7 @@ def test_moderator_can_set_provider_metadata(self, app, registration, moderator)
         assert resp.status_code == 200
 
         registration.refresh_from_db()
-        # Only previder-relevant metadata should be changed
+        # Only provider-relevant metadata should be changed
         assert registration.additional_metadata == {'foo': 'buzz', 'fizz': 'buzz'}
 
         resp = app.get(self.get_registration_detail_url(registration))
diff --git a/api_tests/registrations/views/test_registration_list.py b/api_tests/registrations/views/test_registration_list.py
index e73a6e81cc0..62010e5bcf8 100644
--- a/api_tests/registrations/views/test_registration_list.py
+++ b/api_tests/registrations/views/test_registration_list.py
@@ -1899,7 +1899,7 @@ def test_bulk_update_errors(
         assert res.status_code == 400
         assert res.json['errors'][0]['detail'] == 'Registrations can only be turned from private to public.'
 
-        # Confirm no changes have occured
+        # Confirm no changes have occurred
         registration_one.refresh_from_db()
         registration_two.refresh_from_db()
 
diff --git a/api_tests/registrations/views/test_registrations_childrens_list.py b/api_tests/registrations/views/test_registrations_children_list.py
similarity index 100%
rename from api_tests/registrations/views/test_registrations_childrens_list.py
rename to api_tests/registrations/views/test_registrations_children_list.py
diff --git a/api_tests/requests/views/test_node_request_institutional_access.py b/api_tests/requests/views/test_node_request_institutional_access.py
index d868739e9bd..6f97fcd274a 100644
--- a/api_tests/requests/views/test_node_request_institutional_access.py
+++ b/api_tests/requests/views/test_node_request_institutional_access.py
@@ -164,7 +164,7 @@ def test_institutional_admin_can_add_requested_permission(self, app, project, in
 
     def test_institutional_admin_can_not_add_requested_permission(self, app, project, institutional_admin_on_institution_without_access, url, create_payload_on_institution_without_access):
         """
-        Test that an institutional admin can not make an institutional access request on institution with disabled access .
+        Test that an institutional admin cannot make an institutional access request on institution with disabled access .
         """
         create_payload_on_institution_without_access['data']['attributes']['requested_permissions'] = 'admin'
 
diff --git a/api_tests/resources/annotations/test_open_practice_badge_annotations.py b/api_tests/resources/annotations/test_open_practice_badge_annotations.py
index 78c8a3eb492..334ad19f40f 100644
--- a/api_tests/resources/annotations/test_open_practice_badge_annotations.py
+++ b/api_tests/resources/annotations/test_open_practice_badge_annotations.py
@@ -262,7 +262,7 @@ def test_filtering__has_data(
         self, app, open_data, open_code, open_materials, creator, open_papers, open_supplements, api_url
     ):
         if api_url.startswith(f'/{API_BASE}nodes/'):
-            pytest.xfail(reason='Filtering not implemented for NodeRegistratonsList')
+            pytest.xfail(reason='Filtering not implemented for NodeRegistrationsList')
         filter_url = f'{api_url}?filter[has_data]=True'
         resp = app.get(filter_url, auth=creator.auth, expect_errors=False)
         data = resp.json['data']
@@ -274,7 +274,7 @@ def test_filtering__has_code(
         self, app, open_data, open_code, open_materials, creator, open_papers, open_supplements, api_url
     ):
         if api_url.startswith(f'/{API_BASE}nodes/'):
-            pytest.xfail(reason='Filtering not implemented for NodeRegistratonsList')
+            pytest.xfail(reason='Filtering not implemented for NodeRegistrationsList')
         filter_url = f'{api_url}?filter[has_analytic_code]=True'
         resp = app.get(filter_url, auth=creator.auth, expect_errors=False)
         data = resp.json['data']
@@ -286,7 +286,7 @@ def test_filtering__has_materials(
         self, app, open_data, open_code, open_materials, creator, open_papers, open_supplements, api_url
     ):
         if api_url.startswith(f'/{API_BASE}nodes/'):
-            pytest.xfail(reason='Filtering not implemented for NodeRegistratonsList')
+            pytest.xfail(reason='Filtering not implemented for NodeRegistrationsList')
         filter_url = f'{api_url}?filter[has_materials]=True'
         resp = app.get(filter_url, auth=creator.auth, expect_errors=False)
         data = resp.json['data']
@@ -298,7 +298,7 @@ def test_filtering__has_papers(
         self, app, open_data, open_code, open_materials, creator, open_papers, open_supplements, api_url
     ):
         if api_url.startswith(f'/{API_BASE}nodes/'):
-            pytest.xfail(reason='Filtering not implemented for NodeRegistratonsList')
+            pytest.xfail(reason='Filtering not implemented for NodeRegistrationsList')
         filter_url = f'{api_url}?filter[has_papers]=True'
         resp = app.get(filter_url, auth=creator.auth, expect_errors=False)
         data = resp.json['data']
@@ -310,7 +310,7 @@ def test_filtering__has_supplements(
         self, app, open_data, open_code, open_materials, creator, open_papers, open_supplements, api_url
     ):
         if api_url.startswith(f'/{API_BASE}nodes/'):
-            pytest.xfail(reason='Filtering not implemented for NodeRegistratonsList')
+            pytest.xfail(reason='Filtering not implemented for NodeRegistrationsList')
         filter_url = f'{api_url}?filter[has_supplements]=True'
         resp = app.get(filter_url, auth=creator.auth, expect_errors=False)
         data = resp.json['data']
diff --git a/api_tests/resources/utils.py b/api_tests/resources/utils.py
index 1ffda07f373..9769c05e99e 100644
--- a/api_tests/resources/utils.py
+++ b/api_tests/resources/utils.py
@@ -19,7 +19,7 @@
 # PENDING_WITHDRAW_REQUEST and PENDING_WITHDRAW (overlaps ACCEPTED)
 # REVERTED (overlaps REJECTED)
 #
-# Techncically PENDING and EMBARGO overlap as well, but worth confirming EMBARGO behavior
+# Technically PENDING and EMBARGO overlap as well, but worth confirming EMBARGO behavior
 STATE_VISIBILITY_MAPPINGS = {
     RegStates.INITIAL: {'public': False, 'deleted': False},
     RegStates.PENDING: {'public': False, 'deleted': False},
diff --git a/api_tests/resources/views/test_resource_detail.py b/api_tests/resources/views/test_resource_detail.py
index af795a16dd3..fc8ab4ab9e4 100644
--- a/api_tests/resources/views/test_resource_detail.py
+++ b/api_tests/resources/views/test_resource_detail.py
@@ -316,7 +316,7 @@ def test_patch__resource_type__undefined__is_error_if_previously_set(self, app):
         assert resp.json['errors'][0]['source']['pointer'] == '/data/attributes/resource_type'
 
     def test_patch__pid__updates_identifier(self, app):
-        # For futher nuances of update behavior see osf_tests/test_outcomes
+        # For further nuances of update behavior see osf_tests/test_outcomes
         test_artifact, test_auth, _ = configure_test_preconditions()
         original_identifier = test_artifact.identifier
 
@@ -479,7 +479,7 @@ def test_patch__finalized__patch_is_atomic(self, app):
 
         payload = make_patch_payload(
             test_artifact,
-            new_description='Some new desciprtion',
+            new_description='Some new description',
             new_pid='Some new pid',
             new_resource_type=ArtifactTypes.UNDEFINED,
             is_finalized=True
diff --git a/api_tests/schema_responses/views/test_registrations_schema_responses_list.py b/api_tests/schema_responses/views/test_registrations_schema_responses_list.py
index 0288c3911ec..b85ef5a10c8 100644
--- a/api_tests/schema_responses/views/test_registrations_schema_responses_list.py
+++ b/api_tests/schema_responses/views/test_registrations_schema_responses_list.py
@@ -92,7 +92,7 @@ def _get_status_code_for_preconditions(self, registration_status, moderator_work
             return 410
         # Withdrawn registrations always return
         # UNAUTHORIZED for unauthenticated users and
-        # FORBIDDEN for all othrs
+        # FORBIDDEN for all others
         if registration_status == 'withdrawn':
             if role == 'unauthenticated':
                 return 401
@@ -210,7 +210,7 @@ def test_GET__public_registration_with_unapproved_response(self, app, role, resp
         assert encountered_ids == expected_ids
 
     # Only test contributors here.
-    # Moderators tested elsehwere, and permissions tests confirm that unauthenticated users
+    # Moderators tested elsewhere, and permissions tests confirm that unauthenticated users
     # and non-contributors cannot GET SchemaResponses for private registrations
     @pytest.mark.parametrize('role', ['read', 'write', 'admin'])
     @pytest.mark.parametrize('response_state', ApprovalStates)
diff --git a/api_tests/schema_responses/views/test_schema_response_detail.py b/api_tests/schema_responses/views/test_schema_response_detail.py
index a8cf320fdda..e33eae7d595 100644
--- a/api_tests/schema_responses/views/test_schema_response_detail.py
+++ b/api_tests/schema_responses/views/test_schema_response_detail.py
@@ -228,7 +228,7 @@ def test_status_code__withdrawn_parent(self, app, role):
 
 @pytest.mark.django_db
 class TestSchemaResponseDetailGETBehavior:
-    '''Confirms behavior of GET requests agaisnt the SchemaResponseList Endpoint.
+    '''Confirms behavior of GET requests against the SchemaResponseList Endpoint.
 
     GET should return a serialized instance of the SchemaResponse with the requested ID
     as it exists in the database at the time of the call.
@@ -421,7 +421,7 @@ class TestSchemaResponseDetailPATCHBehavior:
     the SchemaResponse should appear in the list of "updated_response_keys".
 
     Requests that pass an unsupported key in "revision_responses" should return a 400 error,
-    while requests against a SchemaResponse in a state other than IN_PROGRESS shoudl 409.
+    while requests against a SchemaResponse in a state other than IN_PROGRESS should 409.
     '''
 
     @pytest.fixture()
diff --git a/api_tests/schema_responses/views/test_schema_response_list.py b/api_tests/schema_responses/views/test_schema_response_list.py
index 0740989072c..b59126d7e5e 100644
--- a/api_tests/schema_responses/views/test_schema_response_list.py
+++ b/api_tests/schema_responses/views/test_schema_response_list.py
@@ -270,7 +270,7 @@ def registration(self, admin_user):
 
     @pytest.fixture()
     def schema_response(self, registration):
-        '''A pre-existing, APPROVED SchemaResponse on the registration.'''
+        '''A preexisting, APPROVED SchemaResponse on the registration.'''
         response = SchemaResponse.create_initial_response(
             parent=registration, initiator=registration.creator
         )
diff --git a/api_tests/share/test_share_node.py b/api_tests/share/test_share_node.py
index f398c2247e7..2fcc9cc48a8 100644
--- a/api_tests/share/test_share_node.py
+++ b/api_tests/share/test_share_node.py
@@ -161,7 +161,7 @@ def test_update_share_correctly_for_registrations_with_qa_tags(self, mock_share_
             registration.remove_tag(settings.DO_NOT_INDEX_LIST['tags'][0], auth=Auth(user), save=True)
 
     def test_update_share_correctly_for_projects_with_qa_titles(self, mock_share_responses, node, user):
-        node.title = settings.DO_NOT_INDEX_LIST['titles'][0] + ' arbitary text for test title.'
+        node.title = settings.DO_NOT_INDEX_LIST['titles'][0] + ' arbitrary text for test title.'
         node.save()
         with expect_ingest_request(mock_share_responses, node, delete=True):
             on_node_updated(node._id, user._id, False, {'is_public'})
@@ -171,7 +171,7 @@ def test_update_share_correctly_for_projects_with_qa_titles(self, mock_share_res
         assert node.title not in settings.DO_NOT_INDEX_LIST['titles']
 
     def test_update_share_correctly_for_registrations_with_qa_titles(self, mock_share_responses, registration, user):
-        registration.title = settings.DO_NOT_INDEX_LIST['titles'][0] + ' arbitary text for test title.'
+        registration.title = settings.DO_NOT_INDEX_LIST['titles'][0] + ' arbitrary text for test title.'
         with expect_ingest_request(mock_share_responses, registration, delete=True):
             registration.save()
         registration.title = 'Not a qa title'
diff --git a/api_tests/tokens/views/test_token_detail_relationships.py b/api_tests/tokens/views/test_token_detail_relationships.py
index b8f3c01de6a..946e64cf8e4 100644
--- a/api_tests/tokens/views/test_token_detail_relationships.py
+++ b/api_tests/tokens/views/test_token_detail_relationships.py
@@ -301,7 +301,7 @@ def test_non_owner_cant_delete(
 
     @pytest.mark.enable_implicit_clean
     @mock.patch('framework.auth.cas.CasClient.revoke_tokens')
-    def test_create_with_nonexistant_scope_fails(
+    def test_create_with_nonexistent_scope_fails(
             self,
             mock_revoke,
             url_token_list,
@@ -349,7 +349,7 @@ def test_create_with_private_scope_fails(
 
     @pytest.mark.enable_implicit_clean
     @mock.patch('framework.auth.cas.CasClient.revoke_tokens')
-    def test_update_with_nonexistant_scope_fails(
+    def test_update_with_nonexistent_scope_fails(
             self,
             mock_revoke,
             app,
diff --git a/api_tests/tokens/views/test_token_list.py b/api_tests/tokens/views/test_token_list.py
index 94fbabb96a5..4c49a3958b8 100644
--- a/api_tests/tokens/views/test_token_list.py
+++ b/api_tests/tokens/views/test_token_list.py
@@ -151,7 +151,7 @@ def test_returns_401_when_not_logged_in(self, app, url_token_list):
         res = app.get(url_token_list, expect_errors=True)
         assert res.status_code == 401
 
-    def test_cannot_create_token_with_nonexistant_scope(
+    def test_cannot_create_token_with_nonexistent_scope(
             self, app, url_token_list, data_sample, user_one):
         data_sample['data']['relationships']['scopes']['data'][0]['id'] = 'osf.admin'
         res = app.post_json_api(
diff --git a/api_tests/users/views/test_user_claim.py b/api_tests/users/views/test_user_claim.py
index 0e265021c5c..42909ce36bc 100644
--- a/api_tests/users/views/test_user_claim.py
+++ b/api_tests/users/views/test_user_claim.py
@@ -232,3 +232,95 @@ def test_claim_auth_success(self, app, url, claimer, unreg_user, project, mock_s
         )
         assert res.status_code == 204
         assert mock_send_grid.call_count == 2
+
+
+@pytest.mark.django_db
+class TestConfirmClaimUser:
+
+    @pytest.fixture()
+    def referrer(self):
+        return AuthUserFactory()
+
+    @pytest.fixture()
+    def project(self, referrer):
+        return ProjectFactory(creator=referrer)
+
+    @pytest.fixture()
+    def preprint(self, referrer, project):
+        return PreprintFactory(creator=referrer, project=project)
+
+    @pytest.fixture()
+    def wrong_preprint(self, referrer):
+        return PreprintFactory(creator=referrer)
+
+    @pytest.fixture()
+    def unreg_user(self, referrer, project):
+        return project.add_unregistered_contributor(
+            'David Davidson',
+            'david@david.son',
+            auth=Auth(referrer),
+            save=True
+        )
+
+    @pytest.fixture()
+    def url(self):
+        return f'/{API_BASE}users/{{}}/confirm_claim/'
+
+    def payload(self, **kwargs):
+        payload = {
+            'data': {
+                'attributes': {}
+            }
+        }
+        _id = kwargs.pop('id', None)
+        if _id:
+            payload['data']['id'] = _id
+        if kwargs:
+            payload['data']['attributes'] = kwargs
+        return payload
+
+    def test_confirm_claim(self, app, url, unreg_user, project, wrong_preprint):
+        _url = url.format(unreg_user._id)
+        unclaimed_record = unreg_user.get_unclaimed_record(project._id)
+        token = unclaimed_record['token']
+        payload = self.payload(guid=project._id, password='password1234', accepted_terms_of_service=True, token=token)
+        res = app.post_json_api(
+            _url,
+            payload,
+        )
+        assert res.status_code == 200
+        unreg_user.reload()
+        assert unreg_user.is_registered
+
+    def test_confirm_claim_wrong_pid(self, app, url, unreg_user, project, wrong_preprint):
+        _url = url.format(unreg_user._id)
+        token = 'someinvalidtoken'
+        payload = self.payload(guid=wrong_preprint._id, password='password1234', accepted_terms_of_service=True, token=token)
+        res = app.post_json_api(
+            _url,
+            payload,
+            expect_errors=True
+        )
+        assert res.status_code == 400
+        assert res.json['errors'][0]['detail'] == 'Claim user does not exists, the token in the URL is invalid or has expired.'
+
+    def test_claimed_user(self, app, url, unreg_user, project, wrong_preprint):
+        _url = url.format(unreg_user._id)
+        unclaimed_record = unreg_user.get_unclaimed_record(project._id)
+        token = unclaimed_record['token']
+        payload = self.payload(guid=project._id, password='password1234', accepted_terms_of_service=True, token=token)
+        res = app.post_json_api(
+            _url,
+            payload,
+        )
+        assert res.status_code == 200
+        unreg_user.reload()
+        assert unreg_user.is_registered
+
+        res = app.post_json_api(
+            _url,
+            payload,
+            expect_errors=True
+        )
+        assert res.status_code == 400
+        assert res.json['errors'][0]['detail'] == 'User has already been claimed.'
diff --git a/api_tests/users/views/test_user_detail.py b/api_tests/users/views/test_user_detail.py
index cdfc5599ddd..f5a4f0acf6e 100644
--- a/api_tests/users/views/test_user_detail.py
+++ b/api_tests/users/views/test_user_detail.py
@@ -447,7 +447,7 @@ def user_one(self):
             family_name='King',
             suffix='Jr.',
             social=dict(
-                github='userOneGithub',
+                github='userOneGitHub',
                 scholar='userOneScholar',
                 profileWebsites=['http://www.useronepersonalwebsite.com'],
                 twitter='userOneTwitter',
@@ -1349,7 +1349,7 @@ def test_user_put_profile_date_validate_ongoing_position(self, app, user_one, us
         assert res.status_code == 400
 
     def test_user_put_profile_date_validate_end_date(self, app, user_one, user_one_url, request_payload, request_key):
-        # End date is greater then start date
+        # End date is greater than start date
         request_payload['data']['attributes'][request_key][0]['startYear'] = 2000
         res = app.put_json_api(user_one_url, request_payload, auth=user_one.auth, expect_errors=True)
         assert res.status_code == 400
diff --git a/api_tests/users/views/test_user_exceptions.py b/api_tests/users/views/test_user_exceptions.py
index 6dfd848cc54..58b3e7c8a61 100644
--- a/api_tests/users/views/test_user_exceptions.py
+++ b/api_tests/users/views/test_user_exceptions.py
@@ -16,7 +16,7 @@ def user(self):
             family_name='King',
             suffix='Jr.',
             social=dict(
-                github='userOneGithub',
+                github='userOneGitHub',
                 scholar='userOneScholar',
                 profileWebsites=['http://www.useronepersonalwebsite.com'],
                 twitter='userOneTwitter',
diff --git a/api_tests/users/views/test_user_list.py b/api_tests/users/views/test_user_list.py
index 32cc69758d4..548a21d904b 100644
--- a/api_tests/users/views/test_user_list.py
+++ b/api_tests/users/views/test_user_list.py
@@ -305,7 +305,7 @@ def test_logged_out_user_cannot_create_other_user_or_send_mail(
         assert OSFUser.objects.filter(username=email_unconfirmed).count() == 0
         assert mock_send_grid.call_count == 0
 
-    @pytest.mark.skip  # failing locally post converision
+    @pytest.mark.skip  # failing locally post conversion
     def test_cookied_requests_can_create_and_email(
             self, mock_send_grid, app, user, email_unconfirmed, data, url_base):
         # NOTE: skipped tests are not tested during session refactor, only updated to fix import
@@ -324,7 +324,7 @@ def test_cookied_requests_can_create_and_email(
         assert OSFUser.objects.filter(username=email_unconfirmed).count() == 1
         assert mock_send_grid.call_count == 1
 
-    @pytest.mark.skip  # failing locally post converision
+    @pytest.mark.skip  # failing locally post conversion
     @mock.patch('api.base.authentication.drf.OSFCASAuthentication.authenticate')
     # TODO: Remove when available outside of DEV_MODE
     @unittest.skipIf(
@@ -363,7 +363,7 @@ def test_properly_scoped_token_can_create_and_send_email(
         assert OSFUser.objects.filter(username=email_unconfirmed).count() == 1
         assert mock_send_grid.call_count == 1
 
-    @pytest.mark.skip  # failing locally post converision
+    @pytest.mark.skip  # failing locally post conversion
     @mock.patch('api.base.authentication.drf.OSFCASAuthentication.authenticate')
     # TODO: Remove when available outside of DEV_MODE
     @unittest.skipIf(
@@ -404,7 +404,7 @@ def test_properly_scoped_token_does_not_send_email_without_kwarg(
         assert OSFUser.objects.filter(username=email_unconfirmed).count() == 1
         assert mock_send_grid.call_count == 0
 
-    @pytest.mark.skip  # failing locally post converision
+    @pytest.mark.skip  # failing locally post conversion
     @mock.patch('api.base.authentication.drf.OSFCASAuthentication.authenticate')
     # TODO: Remove when available outside of DEV_MODE
     @unittest.skipIf(
@@ -485,7 +485,7 @@ def test_improperly_scoped_token_can_not_create_or_email(
         assert OSFUser.objects.filter(username=email_unconfirmed).count() == 0
         assert mock_send_grid.call_count == 0
 
-    @pytest.mark.skip  # failing locally post converision
+    @pytest.mark.skip  # failing locally post conversion
     @mock.patch('api.base.authentication.drf.OSFCASAuthentication.authenticate')
     # TODO: Remove when available outside of DEV_MODE
     @unittest.skipIf(
diff --git a/api_tests/users/views/test_user_message_institutional_access.py b/api_tests/users/views/test_user_message_institutional_access.py
index 2f60c4ae726..cab2931ac23 100644
--- a/api_tests/users/views/test_user_message_institutional_access.py
+++ b/api_tests/users/views/test_user_message_institutional_access.py
@@ -110,7 +110,7 @@ def test_institutional_admin_can_not_create_message(self, mock_send_grid, app, i
                                                         institution_without_access, url_with_affiliation_on_institution_without_access,
                                                         payload):
         """
-        Ensure an institutional admin cannot create a `UserMessage` with a `message` and `institution` witch has 'institutional_request_access_enabled' as False
+        Ensure an institutional admin cannot create a `UserMessage` with a `message` and `institution` which has 'institutional_request_access_enabled' as False
         """
 
         # Use pytest.raises to explicitly expect the 403 error
diff --git a/api_tests/wikis/views/test_wiki_detail.py b/api_tests/wikis/views/test_wiki_detail.py
index 96f05b5fcfe..4809eb29971 100644
--- a/api_tests/wikis/views/test_wiki_detail.py
+++ b/api_tests/wikis/views/test_wiki_detail.py
@@ -27,7 +27,7 @@
 
 
 def make_rename_payload(wiki_page):
-    new_page_name = 'any acsii string, except "home" sdaww\n\neq'
+    new_page_name = 'any ascii string, except "home" sdaww\n\neq'
     payload = {
         'data': {
             'id': wiki_page._id,
diff --git a/conftest.py b/conftest.py
index a65aa7aa50f..db0d8462447 100644
--- a/conftest.py
+++ b/conftest.py
@@ -213,7 +213,7 @@ def mock_akismet():
 @pytest.fixture
 def mock_datacite(registration):
     """
-    This should be used to mock our our datacite client.
+    This should be used to mock our datacite client.
     Relevant endpoints:
     f'{DATACITE_URL}/metadata'
     f'{DATACITE_URL}/doi'
@@ -243,7 +243,7 @@ def mock_datacite(registration):
 @pytest.fixture
 def mock_crossref():
     """
-    This should be used to mock our our crossref integration.
+    This should be used to mock our crossref integration.
     Relevant endpoints:
     """
     with mock.patch.object(website_settings, 'CROSSREF_URL', 'https://test.crossref.org/servlet/deposit'):
@@ -317,7 +317,7 @@ def mock_spam_head_request():
         yield mock_spam_head_request
 
 
-def rolledback_transaction(loglabel):
+def rolled_back_transaction(loglabel):
     class ExpectedRollback(Exception):
         pass
     try:
@@ -342,7 +342,7 @@ def _class_scoped_db(django_db_setup, django_db_blocker):
     referencing directly.
     """
     with django_db_blocker.unblock():
-        yield from rolledback_transaction('class_transaction')
+        yield from rolled_back_transaction('class_transaction')
 
 
 @pytest.fixture(scope='function')
@@ -360,7 +360,7 @@ def helpful_thing(self):
             return HelpfulThingFactory()
     ```
     """
-    yield from rolledback_transaction('function_transaction')
+    yield from rolled_back_transaction('function_transaction')
 
 @pytest.fixture()
 def mock_send_grid():
diff --git a/framework/addons/data/addons.json b/framework/addons/data/addons.json
index 770bef6cef2..cfd97c19699 100644
--- a/framework/addons/data/addons.json
+++ b/framework/addons/data/addons.json
@@ -23,7 +23,7 @@
             },
             "Forking": {
                 "status": "partial",
-                "text": "Forking a project or component does not copy Github authorization unless the user forking the project is the same user who authorized the Github add-on in the source project being forked."
+                "text": "Forking a project or component does not copy GitHub authorization unless the user forking the project is the same user who authorized the GitHub add-on in the source project being forked."
             },
             "Registering": {
                 "status": "partial",
@@ -49,7 +49,7 @@
             },
             "Logs": {
                 "status": "none",
-                "text": "OSF does not keep track of changes made using Gitlab directly."
+                "text": "OSF does not keep track of changes made using GitLab directly."
             },
             "Forking": {
                 "status": "partial",
diff --git a/framework/auth/campaigns.py b/framework/auth/campaigns.py
index a47b3cf637b..725ff9cd685 100644
--- a/framework/auth/campaigns.py
+++ b/framework/auth/campaigns.py
@@ -68,7 +68,7 @@ def get_campaigns():
                 })
 
             # Proxy campaigns: Registries, OSF only
-            # TODO: refactor for futher branded registries when there is a model for registries providers
+            # TODO: refactor for further branded registries when there is a model for registries providers
             newest_campaigns.update({
                 'osf-registries': {
                     'system_tag': provider_source_tag('osf', 'registry'),
diff --git a/framework/auth/oauth_scopes.py b/framework/auth/oauth_scopes.py
index 8556138eb12..f3f060a2571 100644
--- a/framework/auth/oauth_scopes.py
+++ b/framework/auth/oauth_scopes.py
@@ -434,7 +434,7 @@ class ComposedScopes:
                                                  'all public and private projects accessible to this account.',
                                      is_public=True),
 
-        # Undocumented scopes that can not be requested by third parties (per CAS restriction)
+        # Undocumented scopes that cannot be requested by third parties (per CAS restriction)
         'osf.users.create': scope(parts_=frozenset(ComposedScopes.USERS_CREATE),
                            description='This permission should only be granted to OSF collaborators. Allows a site to '
                                        'programmatically create new users with this account.',
diff --git a/framework/auth/views.py b/framework/auth/views.py
index 26aa494ddd4..590575b8f73 100644
--- a/framework/auth/views.py
+++ b/framework/auth/views.py
@@ -886,7 +886,7 @@ def register_user(**kwargs):
     """
 
     # Verify that email address match.
-    # Note: Both `landing.mako` and `register.mako` already have this check on the form. Users can not submit the form
+    # Note: Both `landing.mako` and `register.mako` already have this check on the form. Users cannot submit the form
     # if emails do not match. However, this check should not be removed given we may use the raw api call directly.
     json_data = request.get_json()
     if str(json_data['email1']).lower() != str(json_data['email2']).lower():
@@ -1072,6 +1072,8 @@ def external_login_email_post():
                 destination = campaign
                 break
 
+    status_message = None
+    error_list = []
     if form.validate():
         clean_email = form.email.data
         user = get_user(email=clean_email)
@@ -1104,11 +1106,11 @@ def external_login_email_post():
                 destination=destination
             )
             # 3. notify user
-            message = language.EXTERNAL_LOGIN_EMAIL_LINK_SUCCESS.format(
+            status_message = language.EXTERNAL_LOGIN_EMAIL_LINK_SUCCESS.format(
+                fullname=fullname,
                 external_id_provider=external_id_provider,
                 email=user.username
             )
-            kind = 'success'
             # 4. Clear session data
             clear_external_first_login_anonymous_session_data(session)
         else:
@@ -1134,22 +1136,26 @@ def external_login_email_post():
                 destination=destination
             )
             # 4. notify user
-            message = language.EXTERNAL_LOGIN_EMAIL_CREATE_SUCCESS.format(
+            status_message = language.EXTERNAL_LOGIN_EMAIL_CREATE_SUCCESS.format(
+                fullname=fullname,
                 external_id_provider=external_id_provider,
                 email=user.username
             )
-            kind = 'success'
-            # 5. Clear session data
+            # 5. clear session data
             clear_external_first_login_anonymous_session_data(session)
-        status.push_status_message(message, kind=kind, trust=False)
     else:
-        forms.push_errors_to_status(form.errors)
+        form_errors = form.errors
+        for field, _ in form_errors.items():
+            for error in form_errors[field]:
+                error_list.append(error)
 
     # Don't go anywhere
     return {
         'form': form,
         'external_id_provider': external_id_provider,
-        'auth_user_fullname': fullname
+        'auth_user_fullname': fullname,
+        'status_message': status_message,
+        'error_list': error_list,
     }
 
 
diff --git a/framework/celery_tasks/__init__.py b/framework/celery_tasks/__init__.py
index 26211b0c74b..67e59564c9e 100644
--- a/framework/celery_tasks/__init__.py
+++ b/framework/celery_tasks/__init__.py
@@ -34,7 +34,7 @@ def error_handler(task_id, task_name):
     # query the broker for the AsyncResult
     result = app.AsyncResult(task_id)
     excep = result.get(propagate=False)
-    # log detailed error mesage in error log
+    # log detailed error message in error log
     logger.error(
         '#####FAILURE LOG BEGIN#####\n'
         f'Task {task_name} raised exception: {excep}\n{result.traceback}\n'
diff --git a/framework/database/__init__.py b/framework/database/__init__.py
index fc1c9b2dbed..6667899c89c 100644
--- a/framework/database/__init__.py
+++ b/framework/database/__init__.py
@@ -19,7 +19,7 @@ def get_or_http_error(Model, pk_or_query, allow_deleted=False, display_name=None
       - a <str> representation of the record's primary key, e.g. 'abcdef'
       - a <QueryBase> subclass query to uniquely select a record, e.g.
         Q('title', 'eq', 'Entitled') & Q('version', 'eq', 1)
-    :param bool allow_deleted: allow deleleted records?
+    :param bool allow_deleted: allow deleted records?
     :param str display_name:
     :raises: HTTPError(404) if the record does not exist
     :raises: HTTPError(400) if no unique record is found
diff --git a/framework/email/tasks.py b/framework/email/tasks.py
index 7bee3ac2f90..efe585f936d 100644
--- a/framework/email/tasks.py
+++ b/framework/email/tasks.py
@@ -48,7 +48,7 @@ def send_email(
     Email is sent from the email specified in FROM_EMAIL settings in the
     settings module.
 
-    Uses the Sendgrid API if ``settings.SENDGRID_API_KEY`` is set.
+    Uses the SendGrid API if ``settings.SENDGRID_API_KEY`` is set.
 
     :param from_addr: A string, the sender email
     :param to_addr: A string, the recipient
@@ -57,7 +57,7 @@ def send_email(
     :param categories: Categories to add to the email using SendGrid's
         SMTPAPI. Used for email analytics.
         See https://sendgrid.com/docs/User_Guide/Statistics/categories.html
-        This parameter is only respected if using the Sendgrid API.
+        This parameter is only respected if using the SendGrid API.
         ``settings.SENDGRID_API_KEY`` must be set.
 
     :return: True if successful
diff --git a/framework/forms/__init__.py b/framework/forms/__init__.py
index 8403359ac17..6e95714d135 100644
--- a/framework/forms/__init__.py
+++ b/framework/forms/__init__.py
@@ -48,7 +48,7 @@ class NoHtmlCharacters:
     we escape for HTML output
 
     TODO: This could still post a problem if we output an email address to a
-    Javascript literal.
+    JavaScript literal.
     """
 
     # TODO: Improve this for a post-bleach world
diff --git a/framework/sessions/__init__.py b/framework/sessions/__init__.py
index b4e4189abc0..21dc850cb53 100644
--- a/framework/sessions/__init__.py
+++ b/framework/sessions/__init__.py
@@ -172,7 +172,7 @@ def before_request():
     ticket = request.args.get('ticket')
     if ticket:
         service_url = furl(request.url).remove(args=['ticket'])
-        # Attempt to authenticate wih CAS, and return a proper redirect response
+        # Attempt to authenticate with CAS, and return a proper redirect response
         return cas.make_response_from_ticket(ticket=ticket, service_url=service_url.url)
 
     # Request Type 2: Basic Auth with username and password in Authorization headers
@@ -187,7 +187,7 @@ def before_request():
         user_session = get_session(ignore_cookie=True)
         user_session.create()
         # Although the if check is not necessary based on current ``get_session()`` implementation. However, we
-        # keep it here in case ``get_session()`` was changed. It may be removed after we have unit tests for this.
+        # keep it here in case ``get_session()`` is changed. It may be removed after we have unit tests for this.
         if not user_session:
             return
 
diff --git a/osf/exceptions.py b/osf/exceptions.py
index 30130a587d1..4c87178b720 100644
--- a/osf/exceptions.py
+++ b/osf/exceptions.py
@@ -2,7 +2,7 @@
 
 from django.core.exceptions import ValidationError as DjangoValidationError
 
-# Remants from MODM days
+# Remnants from MODM days
 # TODO: Remove usages of aliased Exceptions
 ValidationError = DjangoValidationError
 ValidationValueError = DjangoValidationError
@@ -162,7 +162,7 @@ class SchemaBlockConversionError(OSFError):
 
 
 class SchemaResponseError(OSFError):
-    """Superclass for errors ariseing from unexpected SchemaResponse behavior."""
+    """Superclass for errors arising from unexpected SchemaResponse behavior."""
     pass
 
 
@@ -220,7 +220,7 @@ def __init__(self, response, invalid_responses=None, unsupported_keys=None):
             )
         if unsupported_keys:
             unsupported_keys_message = (
-                f'\nReceived the following resposnes had invalid keys: {unsupported_keys}'
+                f'\nReceived the following responses had invalid keys: {unsupported_keys}'
             )
         error_message = (
             f'Error update SchemaResponse with id [{response._id}]:'
diff --git a/osf/external/gravy_valet/request_helpers.py b/osf/external/gravy_valet/request_helpers.py
index ad998217460..a4f7d37694b 100644
--- a/osf/external/gravy_valet/request_helpers.py
+++ b/osf/external/gravy_valet/request_helpers.py
@@ -481,7 +481,7 @@ class JSONAPIRelationship:
 
 
 def _extract_relationships(jsonapi_relationships_data):
-    '''Converts  the `relationship entrie from a JSONAPI into a dict of JSONAPIRelationships keyed by name.'''
+    '''Converts  the `relationship entries from a JSONAPI into a dict of JSONAPIRelationships keyed by name.'''
     relationships_by_name = {}
     for relationship_name, relationship_entry in jsonapi_relationships_data.items():
         if relationship_entry is not None:
diff --git a/osf/features.yaml b/osf/features.yaml
index 98eff0aef9a..a376edc851d 100644
--- a/osf/features.yaml
+++ b/osf/features.yaml
@@ -20,7 +20,7 @@ flags:
 
   - flag_name: ENABLE_GV
     name: gravy_waffle
-    note: This is used to enable GravyValet, the system responible for addons, this will remove the files widget on the
+    note: This is used to enable GravyValet, the system responsible for addons, this will remove the files widget on the
           project overview page. Will be used with EMBER_USER_SETTINGS_ADDONS and EMBER_NODE_SETTINGS_ADDONS to flip all
           UI elements to the new addons system.
     everyone: true
@@ -67,63 +67,63 @@ flags:
 
   - flag_name: EMBER_PROJECT_DETAIL
     name: ember_project_detail_page
-    note: This flag controls wheter the project overview page is routed to the ember app
+    note: This flag controls whether the project overview page is routed to the ember app
     everyone: false
 
   - flag_name: EMBER_CREATE_DRAFT_REGISTRATION
     name: ember_create_draft_registration_page
-    note: This flag controls wheter POST requests to /project/<pid>/registrations/ and
+    note: This flag controls whether POST requests to /project/<pid>/registrations/ and
           /project/<pid>/node/<nid>/registrations/ are routed to the ember app
     everyone: false
 
   - flag_name: EMBER_MEETING_DETAIL
     name: ember_meeting_detail_page
-    note: This flag controls wheter the `conference_results` view routes to the Ember app
+    note: This flag controls whether the `conference_results` view routes to the Ember app
     everyone: true
 
   - flag_name: EMBER_MY_PROJECTS
     name: ember_my_projects_page
-    note: This flag controls wheter the `My Projects Page` view routes to the Ember app
+    note: This flag controls whether the `My Projects Page` view routes to the Ember app
     everyone: false
 
   - flag_name: EMBER_PROJECT_CONTRIBUTORS
     name: ember_project_contributors_page
-    note: This flag controls wheter the `Node Contributor Page` view routes to the Ember app
+    note: This flag controls whether the `Node Contributor Page` view routes to the Ember app
     everyone: false
 
   - flag_name: EMBER_PROJECT_SETTINGS
     name: ember_project_settings_page
-    note: This flag controls wheter the `Node Settings Page` view routes to the Ember app
+    note: This flag controls whether the `Node Settings Page` view routes to the Ember app
     everyone: false
 
   - flag_name: EMBER_PROJECT_WIKI
     name: ember_project_wiki_page
-    note: This flag controls wheter the `Project Wiki Home Page` view routes to the Ember app
+    note: This flag controls whether the `Project Wiki Home Page` view routes to the Ember app
     everyone: false
 
   - flag_name: EMBER_REGISTRATION_FORM_DETAIL
     name: ember_registration_form_detail_page
-    note: This flag controls wheter the `Node Register Template Page` view routes to the Ember app
+    note: This flag controls whether the `Node Register Template Page` view routes to the Ember app
     everyone: false
 
   - flag_name: EMBER_SEARCH_PAGE
     name: ember_search_page
-    note: This flag controls wheter the `Search Page` view routes to the Ember app
+    note: This flag controls whether the `Search Page` view routes to the Ember app
     everyone: true
 
   - flag_name: EMBER_USER_PROFILE
     name: ember_user_profile_page
-    note: This flag controls wheter the `User Profile Page` view routes to the Ember app
+    note: This flag controls whether the `User Profile Page` view routes to the Ember app
     everyone: false
 
   - flag_name: EMBER_USER_SETTINGS
     name: ember_user_settings_page
-    note: This flag controls wheter the `User Settings Page` view routes to the Ember app
+    note: This flag controls whether the `User Settings Page` view routes to the Ember app
     everyone: false
 
   - flag_name: EMBER_USER_SETTINGS_NOTIFICATIONS
     name: ember_user_settings_notifications_page
-    note: This flag controls wheter the `User Notifications Page` view routes to the Ember app
+    note: This flag controls whether the `User Notifications Page` view routes to the Ember app
     everyone: false
 
   - flag_name: EMBER_MEETINGS
@@ -195,24 +195,20 @@ flags:
     note: This is not used
     everyone: true
 
-  - flag_name: INSTITUTIONAL_DASHBOARD_2024
-    name: institutional_dashboard_2024
-    note: whether to surface older or updated (in 2024) institutional metrics
-
   - flag_name: DISABLE_COMMENTS
     name: disable_comments
-    note: This flag controls wheter users can create or interact with comments via BE or FE.
+    note: This flag controls whether users can create or interact with comments via BE or FE.
     everyone: false
 
   - flag_name: DISABLE_MEETINGS
     name: disable_meetings
-    note: This flag controls wheter users can create or interact with meetings via BE or FE.
+    note: This flag controls whether users can create or interact with meetings via BE or FE.
     everyone: false
 
 switches:
   - flag_name: DISABLE_ENGAGEMENT_EMAILS
     name: disable_engagement_emails
-    note: if set to true, prevents engagment emails from being sent
+    note: if set to true, prevents engagement emails from being sent
     active: false
 
   - flag_name: ELASTICSEARCH_METRICS
@@ -227,7 +223,7 @@ switches:
 
   - flag_name: ENABLE_RAW_METRICS
     name: enable_raw_metrics
-    note: allows for raw queries againest our ES metrics database
+    note: allows for raw queries against our ES metrics database
     active: false
 
   - flag_name: OSF_PREREGISTRATION
diff --git a/osf/management/commands/approve_pending_schema_responses.py b/osf/management/commands/approve_pending_schema_responses.py
index 0905451c23e..50f54eaff8a 100644
--- a/osf/management/commands/approve_pending_schema_responses.py
+++ b/osf/management/commands/approve_pending_schema_responses.py
@@ -41,13 +41,13 @@ def approve_pending_schema_responses(dry_run=False):
         )
         try:
             schema_response.accept(
-                comment=f'Auto-approved following {THRESHOLD_HOURS} hour threshhold'
+                comment=f'Auto-approved following {THRESHOLD_HOURS} hour threshold'
             )
         except MachineError:
             logger.exception(
                 f'{"[DRY RUN] " if dry_run else ""}'
                 f'Error auto-approving SchemaResponse with id [{schema_response._id}] '
-                f'for Registration with guit [{schema_response.parent._id}]'
+                f'for Registration with guid [{schema_response.parent._id}]'
             )
         else:
             count += 1
diff --git a/osf/management/commands/change_node_region.py b/osf/management/commands/change_node_region.py
index abce28672bf..b0c97630182 100644
--- a/osf/management/commands/change_node_region.py
+++ b/osf/management/commands/change_node_region.py
@@ -105,10 +105,10 @@ def change_node_region(node, dest_region, gcs_creds):
             if node.type == 'osf.registration':
                 response_blocks_by_file_id = _get_file_block_map(node)
             for f in node.files.all():
-                logger.info(f'Prepraring to move file {f._id}')
+                logger.info(f'Preparing to move file {f._id}')
                 cloned_f = _clone_file(f)
                 if f._id in response_blocks_by_file_id:
-                    logger.info(f'Prepraring to update ResponseBlocks for file {f._id}')
+                    logger.info(f'Preparing to update ResponseBlocks for file {f._id}')
                     _update_blocks(response_blocks_by_file_id, f._id, cloned_f._id)
                 logger.info(f'File {f._id} cloned, copying versions...')
                 _copy_and_clone_versions(f, cloned_f, src_bucket, dest_bucket, dest_bucket_name, dest_region)
diff --git a/osf/management/commands/delete_withdrawn_or_failed_registration_files.py b/osf/management/commands/delete_withdrawn_or_failed_registration_files.py
index 12b22b3e8e5..21acbd1d93d 100644
--- a/osf/management/commands/delete_withdrawn_or_failed_registration_files.py
+++ b/osf/management/commands/delete_withdrawn_or_failed_registration_files.py
@@ -21,7 +21,7 @@ def mark_withdrawn_files_as_deleted(batch_size, dry_run=False):
     for node in withdrawn_registrations.annotate(fc=Count('files')).filter(fc__gte=1)[:batch_size]:
         files_to_be_deleted = node.files.all()
         logger.info(
-            f'{"[DRY-RUN]" if dry_run else ""} There are {files_to_be_deleted.count()} files deleted from withrawn node ({node._id})')
+            f'{"[DRY-RUN]" if dry_run else ""} There are {files_to_be_deleted.count()} files deleted from withdrawn node ({node._id})')
         for file in files_to_be_deleted:
             if not dry_run:
                 file.delete()
diff --git a/osf/management/commands/email_all_users.py b/osf/management/commands/email_all_users.py
index f5cbd677fb7..c8031081e03 100644
--- a/osf/management/commands/email_all_users.py
+++ b/osf/management/commands/email_all_users.py
@@ -92,7 +92,7 @@ def add_arguments(self, parser):
             '--ids',
             dest='ids',
             nargs='+',
-            help='Specific IDs to email, otherwise will email all users'
+            help='Specific IDs to email; otherwise, will email all users'
         )
 
         parser.add_argument(
diff --git a/osf/management/commands/fix_registration_file_domains.py b/osf/management/commands/fix_registration_file_domains.py
index 72529cf3f87..c4577b0cf64 100644
--- a/osf/management/commands/fix_registration_file_domains.py
+++ b/osf/management/commands/fix_registration_file_domains.py
@@ -48,7 +48,7 @@ def fix_registration_response_file_links(registration):
                 urls['download'] = urls['download'].replace(BAD_DOMAIN, DOMAIN)
             block.save()
 
-    # Re-set registration_responses and registered_meta bssed on the *latest* schema_response,
+    # Re-set registration_responses and registered_meta based on the *latest* schema_response,
     # which will have inherited these fixes if not already explicitly updated
     registration.registration_responses = registration.schema_responses.first().all_responses
     registration.registered_meta[schema._id] = registration.expand_registration_responses()
diff --git a/osf/management/commands/manage_switch_flags.py b/osf/management/commands/manage_switch_flags.py
index 77154509a47..c9d5a756ec1 100644
--- a/osf/management/commands/manage_switch_flags.py
+++ b/osf/management/commands/manage_switch_flags.py
@@ -40,7 +40,7 @@ def add_arguments(self, parser):
         parser.add_argument(
             '-delete',
             action='store_true',
-            help='Use this flag to remove flags, otherwise the script will just add flags'
+            help='Use this flag to remove flags; otherwise, the script will just add flags'
         )
 
     def handle(self, *args, **options):
diff --git a/osf/management/commands/osf_shell.py b/osf/management/commands/osf_shell.py
index 1739e653c93..851895623ac 100644
--- a/osf/management/commands/osf_shell.py
+++ b/osf/management/commands/osf_shell.py
@@ -2,7 +2,7 @@
 Includes all features from django-extension's shell_plus command plus OSF-specific
 niceties.
 
-By default, sessions run in a transaction, so changes won't be commited until
+By default, sessions run in a transaction, so changes won't be committed until
 you execute `commit()`.
 
 All models are imported by default, as well as common OSF and Django objects.
diff --git a/osf/management/commands/populate_custom_taxonomies.py b/osf/management/commands/populate_custom_taxonomies.py
index 8d6f304877f..2f7e5e191d4 100644
--- a/osf/management/commands/populate_custom_taxonomies.py
+++ b/osf/management/commands/populate_custom_taxonomies.py
@@ -194,7 +194,7 @@ def migrate(provider=None, provider_type='osf.preprintprovider', share_title=Non
 
     assert custom_provider, f'Unable to find specified provider: {provider}'
     assert custom_provider.id != BEPRESS_PROVIDER.id, 'Cannot add custom mapping to BePress provider'
-    assert not custom_provider.subjects.exists(), 'Provider aldready has a custom taxonomy'
+    assert not custom_provider.subjects.exists(), 'Provider already has a custom taxonomy'
 
     if isinstance(custom_provider, PreprintProvider) and custom_provider.share_title in [None, '', 'bepress']:
         if not share_title:
diff --git a/osf/management/commands/populate_fake_providers.py b/osf/management/commands/populate_fake_providers.py
index 8ecde0aec84..0f2a236c26a 100644
--- a/osf/management/commands/populate_fake_providers.py
+++ b/osf/management/commands/populate_fake_providers.py
@@ -140,13 +140,13 @@ def format_domain_url(domain):
             'is_public': True,
             'is_promoted': True,
             'is_bookmark_collection': False,
-            'title': 'Very bouncey things',
+            'title': 'Very bouncy things',
             'collected_type_choices': [
                 'Forgotten',
-                'Remebered',
+                'Remembered',
             ],
             'status_choices': [
-                'In-progess',
+                'In-progress',
                 'Almost done',
                 'Complete',
             ],
@@ -167,7 +167,7 @@ def format_domain_url(domain):
             'is_public': True,
             'is_promoted': True,
             'is_bookmark_collection': False,
-            'title': 'Future predections',
+            'title': 'Future predictions',
             'collected_type_choices': [
                 'project',
                 'paper',
diff --git a/osf/management/commands/populate_impact_institution_metrics.py b/osf/management/commands/populate_impact_institution_metrics.py
deleted file mode 100644
index 9c8ddd03a80..00000000000
--- a/osf/management/commands/populate_impact_institution_metrics.py
+++ /dev/null
@@ -1,113 +0,0 @@
-import datetime as dt
-from random import random
-from django.core.management.base import BaseCommand
-
-from osf.metrics import (
-    InstitutionProjectCounts,
-    UserInstitutionProjectCounts,
-)
-
-from osf.models import Institution, OSFUser
-
-
-"""
-This management command can be run to populate impact with fake
-institutional metrics data.
-
-All flags are optional with the script defaulting to 3 users and 1 institution
-from your local database with metrics for the past 7 days.
-
---users: Specify user guids
---num_users: Specify the number of users to use from the database (if
-user guids aren't specified)
---institutions: Specify institution guids
---num_institutions: Specify the number of institutions to use from the database
-(if institution guids aren't specified)
---days: Specify the number of days to write metrics data for
-
-Example: docker-compose run --rm web python3 manage.py populate_impact_institution_metrics --days 3 --institutions cos --users hy84n bd53u
-"""
-
-
-def populate_institution_metrics(users, institutions, dates):
-    institution_public_project_count = 25 + (int(25 * random()))
-    institution_private_project_count = 25 + (int(25 * random()))
-
-    for date in dates:
-
-        for institution in institutions:
-            institution_public_project_count = institution_public_project_count - int(5 * random())
-            institution_private_project_count = institution_private_project_count - int(5 * random())
-
-            InstitutionProjectCounts.record_institution_project_counts(
-                institution=institution,
-                public_project_count=institution_public_project_count,
-                private_project_count=institution_private_project_count,
-                timestamp=date
-            )
-
-            for user in users:
-                user_public_project_count = (int(10 * random()))
-                user_private_project_count = (int(10 * random()))
-
-                UserInstitutionProjectCounts.record_user_institution_project_counts(
-                    institution=institution,
-                    user=user,
-                    public_project_count=user_public_project_count,
-                    private_project_count=user_private_project_count,
-                    timestamp=date
-                )
-
-
-class Command(BaseCommand):
-
-    def add_arguments(self, parser):
-        super().add_arguments(parser)
-        parser.add_argument(
-            '--users',
-            nargs='*',
-            help='Specify user guids'
-        )
-        parser.add_argument(
-            '--num_users',
-            type=int,
-            default=3,
-            help='Specify number of users to use if not specifying users'
-        )
-        parser.add_argument(
-            '--institutions',
-            nargs='*',
-            help='Specify insitutions guids'
-        )
-        parser.add_argument(
-            '--num_institutions',
-            type=int,
-            default=1,
-            help='Specify number of institutions to use if not specifying institutions'
-        )
-        parser.add_argument(
-            '--days',
-            type=int,
-            default=7,
-            help='Specify number of past days to write metrics data for'
-        )
-
-    def handle(self, *args, **options):
-        days = options.get('days')
-        num_users = options.get('num_users')
-        num_institutions = options.get('num_institutions')
-
-        if options.get('users'):
-            users = OSFUser.objects.filter(guids___id__in=options.get('users'))
-        else:
-            users = OSFUser.objects.all()[:num_users]
-
-        if options.get('institutions'):
-            institutions = Institution.objects.filter(_id__in=options.get('institutions'))
-        else:
-            institutions = Institution.objects.all()[:num_institutions]
-
-        today = dt.datetime.today()
-        last_x_days = [(today - dt.timedelta(days=num_days)) for num_days in range(0, days)]
-
-        populate_institution_metrics(users, institutions, last_x_days)
diff --git a/osf/management/commands/populate_initial_schema_responses.py b/osf/management/commands/populate_initial_schema_responses.py
index 26ba3da7710..dbf39fcd576 100644
--- a/osf/management/commands/populate_initial_schema_responses.py
+++ b/osf/management/commands/populate_initial_schema_responses.py
@@ -18,13 +18,13 @@
 
 
 def _update_schema_response_state(schema_response):
-    '''Set the schema_response's state based on the current state of the parent rgistration.'''
+    '''Set the schema_response's state based on the current state of the parent registration.'''
     moderation_state = schema_response.parent.moderation_state
     if moderation_state in UNAPPROVED_STATES:
         schema_response.state = ApprovalStates.UNAPPROVED
     elif moderation_state in PENDING_MODERATION_STATES:
         schema_response.state = ApprovalStates.PENDING_MODERATION
-    else:  # All remainint states imply initial responses were approved by users at some point
+    else:  # All remaining states imply initial responses were approved by users at some point
         schema_response.state = ApprovalStates.APPROVED
     schema_response.save()
 
diff --git a/osf/management/commands/reindex_versioned_preprints.py b/osf/management/commands/reindex_versioned_preprints.py
new file mode 100644
index 00000000000..b48e53487e6
--- /dev/null
+++ b/osf/management/commands/reindex_versioned_preprints.py
@@ -0,0 +1,104 @@
+import logging
+from django.core.management.base import BaseCommand
+
+from osf.models import Preprint
+
+logger = logging.getLogger(__name__)
+
+
+def reindex_versioned_preprints(dry_run=False, batch_size=100, provider_id=None, guids=None):
+    if guids:
+        preprints = Preprint.objects.filter(guids___id__in=guids)
+    else:
+        preprints = Preprint.objects.filter(versioned_guids__isnull=False).distinct()
+
+        if provider_id:
+            preprints = preprints.filter(provider___id=provider_id)
+
+    preprints = preprints.filter(is_published=True)
+
+    total_count = preprints.count()
+    logger.info(f'{"[DRY RUN] " if dry_run else ""}Found {total_count} versioned preprints to re-index')
+
+    if total_count == 0:
+        logger.info('No preprints to re-index')
+        return
+
+    processed = 0
+    for preprint in preprints.iterator(chunk_size=batch_size):
+        processed += 1
+
+        if dry_run:
+            logger.info(
+                f'[DRY RUN] Would re-index preprint {preprint._id} '
+                f'(version {preprint.versioned_guids.first().version if preprint.versioned_guids.exists() else "N/A"}, '
+                f'date_created_first_version={preprint.date_created_first_version}) '
+                f'[{processed}/{total_count}]'
+            )
+        else:
+            try:
+                preprint.update_search()
+                if processed % 10 == 0:
+                    logger.info(
+                        f'Re-indexed preprint {preprint._id} '
+                        f'(version {preprint.versioned_guids.first().version if preprint.versioned_guids.exists() else "N/A"}) '
+                        f'[{processed}/{total_count}]'
+                    )
+            except Exception as e:
+                logger.error(f'Failed to re-index preprint {preprint._id}: {e}')
+
+    logger.info(
+        f'{"[DRY RUN] " if dry_run else ""}Completed. '
+        f'{"Would have re-indexed" if dry_run else "Re-indexed"} {processed} preprints'
+    )
+
+
+class Command(BaseCommand):
+    help = (
+        'Re-index all versioned preprints to Elasticsearch to ensure computed properties '
+        'like date_created_first_version are up to date.'
+    )
+
+    def add_arguments(self, parser):
+        super().add_arguments(parser)
+        parser.add_argument(
+            '--dry-run',
+            action='store_true',
+            dest='dry_run',
+            help='Preview what would be re-indexed without actually making changes',
+        )
+        parser.add_argument(
+            '--batch-size',
+            type=int,
+            default=100,
+            help='Number of preprints to process in each batch (default: 100)',
+        )
+        parser.add_argument(
+            '--provider',
+            type=str,
+            help='Optional provider ID to filter preprints',
+        )
+        parser.add_argument(
+            '--guids',
+            type=str,
+            nargs='+',
+            help='Optional list of specific preprint GUIDs to re-index',
+        )
+
+    def handle(self, *args, **options):
+        dry_run = options.get('dry_run', False)
+        batch_size = options.get('batch_size', 100)
+        provider_id = options.get('provider')
+        guids = options.get('guids')
+
+        if dry_run:
+            logger.info('=' * 60)
+            logger.info('DRY RUN MODE - No changes will be made')
+            logger.info('=' * 60)
+
+        reindex_versioned_preprints(
+            dry_run=dry_run,
+            batch_size=batch_size,
+            provider_id=provider_id,
+            guids=guids
+        )
diff --git a/osf/management/commands/update_institution_project_counts.py b/osf/management/commands/update_institution_project_counts.py
deleted file mode 100644
index 53a0d735ddc..00000000000
--- a/osf/management/commands/update_institution_project_counts.py
+++ /dev/null
@@ -1,52 +0,0 @@
-import datetime as dt
-
-from django.core.management.base import BaseCommand
-
-from framework.celery_tasks import app as celery_app
-from osf.metrics import InstitutionProjectCounts, UserInstitutionProjectCounts
-from osf.models import Institution, Node
-
-
-@celery_app.task(name='management.commands.update_institution_project_counts')
-def update_institution_project_counts():
-    now = dt.datetime.now()
-
-    for institution in Institution.objects.all():
-
-        institution_public_projects_qs = institution.nodes.filter(type='osf.node', parent_nodes=None, is_public=True, is_deleted=False)
-        institution_private_projects_qs = institution.nodes.filter(type='osf.node', parent_nodes=None, is_public=False, is_deleted=False)
-
-        institution_public_projects_count = institution_public_projects_qs.count()
-        institution_private_projects_count = institution_private_projects_qs.count()
-
-        InstitutionProjectCounts.record_institution_project_counts(
-            institution=institution,
-            public_project_count=institution_public_projects_count,
-            private_project_count=institution_private_projects_count,
-            timestamp=now
-        )
-
-        for user in institution.get_institution_users():
-            user_public_project_count = Node.objects.get_nodes_for_user(
-                user=user,
-                base_queryset=institution_public_projects_qs
-            ).count()
-
-            user_private_project_count = Node.objects.get_nodes_for_user(
-                user=user,
-                base_queryset=institution_private_projects_qs
-            ).count()
-
-            UserInstitutionProjectCounts.record_user_institution_project_counts(
-                user=user,
-                institution=institution,
-                public_project_count=user_public_project_count,
-                private_project_count=user_private_project_count,
-                timestamp=now
-            )
-
-
-class Command(BaseCommand):
-
-    def handle(self, *args, **options):
-        update_institution_project_counts()
diff --git a/osf/management/commands/update_old_sanction_states.py b/osf/management/commands/update_old_sanction_states.py
index c6c241152bb..70a9a427793 100644
--- a/osf/management/commands/update_old_sanction_states.py
+++ b/osf/management/commands/update_old_sanction_states.py
@@ -12,7 +12,7 @@ def update_old_sanction_states():
     '''Fix out-of-date states for Embargo and Retraction objects.
 
     https://github.com/CenterForOpenScience/osf.io/pull/3919 homogenized a lot
-    of the code behind the Embargo and Retraction objecs as part of introducing
+    of the code behind the Embargo and Retraction objects as part of introducing
     the RegistrationApproval. It abruptly changed the acceptable states for
     these models without updating existing values for them. This command
     will bring them up-to-date.
diff --git a/osf/management/commands/update_registration_schemas.py b/osf/management/commands/update_registration_schemas.py
index 6fb72a1a136..c7e4e54dc68 100644
--- a/osf/management/commands/update_registration_schemas.py
+++ b/osf/management/commands/update_registration_schemas.py
@@ -8,7 +8,7 @@
 
 @transaction.atomic
 def update_registration_schemas(dry_run=False):
-    """Update the regitration schemas to match the locally defined schemas."""
+    """Update the registration schemas to match the locally defined schemas."""
     logger.debug('Updating Registration Schemas')
     migrations.ensure_schemas()
     logger.debug('Updating Registration Schema Blocks')
diff --git a/osf/metadata/definitions/datacite/datacite-v4.xsd b/osf/metadata/definitions/datacite/datacite-v4.xsd
index a023b165897..5834740fd2f 100644
--- a/osf/metadata/definitions/datacite/datacite-v4.xsd
+++ b/osf/metadata/definitions/datacite/datacite-v4.xsd
@@ -6,7 +6,7 @@
   2011-01-17 Complete revision after community review. FZ, TIB
   2011-03-17 Release of v2.1: added a namespace; mandatory properties got minLength; changes in the definitions of relationTypes IsDocumentedBy/Documents and isCompiledBy/Compiles; changes type of property "Date" from xs:date to xs:string. FZ, TIB
   2011-06-27 v2.2: namespace: kernel-2.2, additions to controlled lists "resourceType", "contributorType", "relatedIdentifierType", and "descriptionType". Removal of intermediate include-files.
-  2013-07-24 v3.0: namespace: kernel-3.0; delete LastMetadataUpdate & MetadateVersionNumber; additions to controlled lists "contributorType", "dateType", "descriptionType", "relationType", "relatedIdentifierType" & "resourceType"; deletion of "StartDate" & "EndDate" from list "dateType" and "Film" from "resourceType";  allow arbitrary order of elements; allow optional wrapper elements to be empty; include xml:lang attribute for title, subject & description; include attribute schemeURI for nameIdentifier of creator, contributor & subject; added new attributes "relatedMetadataScheme", "schemeURI" & "schemeType" to relatedIdentifier; included new property "geoLocation"
+  2013-07-24 v3.0: namespace: kernel-3.0; delete LastMetadataUpdate & MetadataVersionNumber; additions to controlled lists "contributorType", "dateType", "descriptionType", "relationType", "relatedIdentifierType" & "resourceType"; deletion of "StartDate" & "EndDate" from list "dateType" and "Film" from "resourceType";  allow arbitrary order of elements; allow optional wrapper elements to be empty; include xml:lang attribute for title, subject & description; include attribute schemeURI for nameIdentifier of creator, contributor & subject; added new attributes "relatedMetadataScheme", "schemeURI" & "schemeType" to relatedIdentifier; included new property "geoLocation"
   2014-08-20 v3.1: additions to controlled lists "relationType", contributorType" and "relatedIdentifierType"; introduction of new child element "affiliation" to "creator" and "contributor"
   2016-09-19 v4.0: namespace: kernel-4.0; makes "resourceType" required field, added optional "givenName" and "familyName" to creator and contributor, added "funderReference", added "valueURI" for subject, added "geoLocationPolygon"
   2017-10-23 v4.1: Addition of dateType value "Other", relationType values "Describes", "IsDescribedBy", "HasVersion", "IsVersionOf", "Requires", "IsRequiredBy", resourceType value "DataPaper", new subproperties "dateInformation", "inPolygonPoint", new attribute "nameType", optional attribute "resourceTypeGeneral" for relatedIdentifier 
@@ -263,7 +263,7 @@
             <xs:sequence>
               <xs:element name="size" type="xs:string" minOccurs="0" maxOccurs="unbounded">
                 <xs:annotation>
-                  <xs:documentation>Unstructures size information about the resource.</xs:documentation>
+                  <xs:documentation>Unstructured size information about the resource.</xs:documentation>
                 </xs:annotation>
               </xs:element>
             </xs:sequence>
diff --git a/osf/metadata/schemas/datacite.json b/osf/metadata/schemas/datacite.json
index 84460feaf0f..650598b8ee4 100644
--- a/osf/metadata/schemas/datacite.json
+++ b/osf/metadata/schemas/datacite.json
@@ -166,7 +166,7 @@
       }
     },
     "contributors": {
-      "description": "The institution or person responsible for collecting, creating, or otherwise contributing to the developement of the dataset. The personal name format should be: Family, Given.",
+      "description": "The institution or person responsible for collecting, creating, or otherwise contributing to the development of the dataset. The personal name format should be: Family, Given.",
       "type": "array",
       "items": {
         "type": "object",
@@ -380,7 +380,7 @@
       }
     },
     "sizes": {
-      "description": "Unstructures size information about the resource.",
+      "description": "Unstructured size information about the resource.",
       "type": "array",
       "items": {
         "type": "string"
diff --git a/osf/metadata/serializers/google_dataset_json_ld.py b/osf/metadata/serializers/google_dataset_json_ld.py
index 5de0a35ee6a..8fe84d53055 100644
--- a/osf/metadata/serializers/google_dataset_json_ld.py
+++ b/osf/metadata/serializers/google_dataset_json_ld.py
@@ -13,7 +13,7 @@
 class GoogleDatasetJsonLdSerializer(_base.MetadataSerializer):
     mediatype = 'application/ld+json'
 
-    # Descriptions must innclude the 50 minimum characters for Google Dataset Discovery to accept the item as valid
+    # Descriptions must include the 50 minimum characters for Google Dataset Discovery to accept the item as valid
     DEFAULT_DESCRIPTION = 'No description was included in this Dataset collected from the OSF'
 
     def filename_for_itemid(self, itemid: str):
diff --git a/osf/metrics/__init__.py b/osf/metrics/__init__.py
index 9ac7e49a573..0e7b1a1cf32 100644
--- a/osf/metrics/__init__.py
+++ b/osf/metrics/__init__.py
@@ -5,11 +5,6 @@
     PreprintDownload,
 )
 
-from .institution_metrics import (
-    InstitutionProjectCounts,
-    UserInstitutionProjectCounts,
-)
-
 from .registry_metrics import RegistriesModerationMetrics
 
 from .reports import (
@@ -38,9 +33,7 @@
 __all__ = (
     'CountedAuthUsage',
     'DAILY_REPORTS',
-    'InstitutionProjectCounts',
     'PreprintView',
     'PreprintDownload',
     'RegistriesModerationMetrics',
-    'UserInstitutionProjectCounts',
 )
diff --git a/osf/metrics/institution_metrics.py b/osf/metrics/institution_metrics.py
deleted file mode 100644
index f04bb53ce49..00000000000
--- a/osf/metrics/institution_metrics.py
+++ /dev/null
@@ -1,150 +0,0 @@
-from datetime import datetime, timedelta
-
-from elasticsearch_metrics import metrics
-
-from api.base.settings import MAX_SIZE_OF_ES_QUERY, DEFAULT_ES_NULL_VALUE
-from .metric_mixin import MetricMixin
-
-
-class UserInstitutionProjectCounts(MetricMixin, metrics.Metric):
-    user_id = metrics.Keyword(index=True, doc_values=True, required=True)
-    institution_id = metrics.Keyword(index=True, doc_values=True, required=True)
-    department = metrics.Keyword(index=True, doc_values=True, required=False)
-    public_project_count = metrics.Integer(index=True, doc_values=True, required=True)
-    private_project_count = metrics.Integer(index=True, doc_values=True, required=True)
-
-    class Index:
-        settings = {
-            'number_of_shards': 1,
-            'number_of_replicas': 1,
-            'refresh_interval': '1s',
-        }
-
-    class Meta:
-        source = metrics.MetaField(enabled=True)
-
-    @classmethod
-    def filter_institution(cls, institution):
-        return cls.search().filter('match', institution_id=institution._id)
-
-    @classmethod
-    def get_recent_datetime(cls, institution):
-        search = cls.filter_institution(institution).sort('-timestamp')
-
-        # Rounding to the nearest minute
-        results = search.execute()
-        if results:
-            return search.execute()[0].timestamp.replace(microsecond=0, second=0)
-        # If there are no results, assume yesterday.
-        return datetime.now() - timedelta(days=1)
-
-    @classmethod
-    def get_department_counts(cls, institution) -> list:
-        """
-        Gets the most recent document for every unique user.
-        :param institution: Institution
-        :return: list
-        """
-        search = cls.filter_institution(institution).sort('timestamp')
-        last_record_time = cls.get_recent_datetime(institution)
-
-        return search.update_from_dict({
-            'aggs': {
-                'date_range': {
-                    'filter': {
-                        'range': {
-                            'timestamp': {
-                                'gte': last_record_time,
-                            }
-                        }
-                    },
-                    'aggs': {
-                        'departments': {
-                            'terms': {
-                                'field': 'department',
-                                'missing': DEFAULT_ES_NULL_VALUE,
-                                'size': 250
-                            },
-                            'aggs': {
-                                'users': {
-                                    'terms': {
-                                        'field': 'user_id'
-                                    }
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-        })
-
-    @classmethod
-    def record_user_institution_project_counts(cls, user, institution, public_project_count, private_project_count, **kwargs):
-        affiliation = user.get_institution_affiliation(institution._id)
-        return cls.record(
-            user_id=user._id,
-            institution_id=institution._id,
-            department=getattr(affiliation, 'sso_department', DEFAULT_ES_NULL_VALUE),
-            public_project_count=public_project_count,
-            private_project_count=private_project_count,
-            **kwargs
-        )
-
-    @classmethod
-    def get_current_user_metrics(cls, institution) -> list:
-        """
-        Gets the most recent document for every unique user.
-        :param institution: Institution
-        :return: list
-        """
-        last_record_time = cls.get_recent_datetime(institution)
-
-        search = cls.filter_institution(
-            institution
-        ).filter(
-            'range',
-            timestamp={
-                'gte': last_record_time
-            }
-        ).sort(
-            'user_id'
-        )
-        search.update_from_dict({
-            'size': MAX_SIZE_OF_ES_QUERY
-        })
-
-        return search
-
-
-class InstitutionProjectCounts(MetricMixin, metrics.Metric):
-    institution_id = metrics.Keyword(index=True, doc_values=True, required=True)
-    user_count = metrics.Integer(index=True, doc_values=True, required=True)
-    public_project_count = metrics.Integer(index=True, doc_values=True, required=True)
-    private_project_count = metrics.Integer(index=True, doc_values=True, required=True)
-
-    class Index:
-        settings = {
-            'number_of_shards': 1,
-            'number_of_replicas': 1,
-            'refresh_interval': '1s',
-        }
-
-    class Meta:
-        source = metrics.MetaField(enabled=True)
-
-    @classmethod
-    def record_institution_project_counts(cls, institution, public_project_count, private_project_count, **kwargs):
-        return cls.record(
-            institution_id=institution._id,
-            user_count=institution.get_institution_users().count(),
-            public_project_count=public_project_count,
-            private_project_count=private_project_count,
-            **kwargs
-        )
-
-    @classmethod
-    def get_latest_institution_project_document(cls, institution):
-        search = cls.search().filter('match', institution_id=institution._id).sort('-timestamp')[:1]
-        response = search.execute()
-        if response:
-            return response[0]
diff --git a/osf/metrics/registry_metrics.py b/osf/metrics/registry_metrics.py
index e0059a6f741..475dca28673 100644
--- a/osf/metrics/registry_metrics.py
+++ b/osf/metrics/registry_metrics.py
@@ -39,7 +39,7 @@ def record_transitions(cls, action):
     def get_registries_info(cls) -> dict:
         """
         Gets metrics info for each registry
-        excpected output:
+        expected output:
         {
             'doc_count_error_upper_bound': 0,
             'sum_other_doc_count': 0,
diff --git a/osf/models/base.py b/osf/models/base.py
index 8e50557e3ba..9e6d5f502d4 100644
--- a/osf/models/base.py
+++ b/osf/models/base.py
@@ -605,6 +605,9 @@ def get_guid(self):
         """
         return self.versioned_guids.first().guid
 
+    def get_versioned_absolute_api_v2_url(self, version):
+        raise NotImplementedError
+
     def get_semantic_iri(self):
         """Override `get_semantic_iri()` in `GuidMixin` so that all versions of the same object have the same semantic
         iri using only the base guid str.
diff --git a/osf/models/collection_submission.py b/osf/models/collection_submission.py
index 893533d85d1..f517c7fb988 100644
--- a/osf/models/collection_submission.py
+++ b/osf/models/collection_submission.py
@@ -107,7 +107,7 @@ def _notify_contributors_pending(self, event_data):
                 mail=mails.COLLECTION_SUBMISSION_SUBMITTED(self.creator, self.guid.referent),
                 user=contributor,
                 submitter=user,
-                is_initator=self.creator == contributor,
+                is_initiator=self.creator == contributor,
                 is_admin=self.guid.referent.has_permission(contributor, ADMIN),
                 is_registered_contrib=contributor.is_registered,
                 collection=self.collection,
diff --git a/osf/models/conference.py b/osf/models/conference.py
index 15d8e43db88..bbdf92e1079 100644
--- a/osf/models/conference.py
+++ b/osf/models/conference.py
@@ -60,7 +60,7 @@ class Conference(ObjectIDMixin, BaseModel):
     poster = models.BooleanField(default=True)
     talk = models.BooleanField(default=True)
     # field_names are used to customize the text on the conference page, the categories
-    # of submissions, and the email adress to send material to.
+    # of submissions, and the email address to send material to.
     field_names = DateTimeAwareJSONField(default=get_default_field_names)
 
     auto_check_spam = models.BooleanField(default=True)
diff --git a/osf/models/external.py b/osf/models/external.py
index 89fcceebb09..d591db233c2 100644
--- a/osf/models/external.py
+++ b/osf/models/external.py
@@ -461,7 +461,7 @@ def refresh_oauth_key(self, force=False, extra=None, resp_auth_token_key='access
 
     def _needs_refresh(self):
         """Determines whether or not an associated ExternalAccount needs
-        a oauth_key.
+        an oauth_key.
 
         return bool: True if needs_refresh
         """
diff --git a/osf/models/files.py b/osf/models/files.py
index d164df323fa..e01b245bfac 100644
--- a/osf/models/files.py
+++ b/osf/models/files.py
@@ -312,7 +312,7 @@ def touch(self, auth_header, revision=None, **kwargs):
         """The bread and butter of File, collects metadata about self
         and creates versions and updates self when required.
         If revisions is None the created version is NOT and should NOT be saved
-        as there is no identifing information to tell if it needs to be updated or not.
+        as there is no identifying information to tell if it needs to be updated or not.
         Hits Waterbutler's metadata endpoint and saves the returned data.
         If a file cannot be rendered IE figshare private files a tuple of the FileVersion and
         renderable HTML will be returned.
@@ -320,7 +320,7 @@ def touch(self, auth_header, revision=None, **kwargs):
         :param str or None auth_header: If truthy it will set as the Authorization header
         :returns: None if the file is not found otherwise FileVersion or (version, Error HTML)
         """
-        # Resvolve primary key on first touch
+        # Resolve primary key on first touch
         self.save()
         # For backwards compatibility
         revision = revision or kwargs.get(self.version_identifier)
@@ -489,7 +489,7 @@ def kind(self):
         return 'file'
 
     def update(self, revision, data, user=None, save=True):
-        """Using revision and data update all data pretaining to self
+        """Using revision and data update all data pertaining to self
         :param str or None revision: The revision that data points to
         :param dict data: Metadata received from waterbutler
         :returns: FileVersion
@@ -500,7 +500,7 @@ def update(self, revision, data, user=None, save=True):
         version = FileVersion(identifier=revision)
         version.update_metadata(data, save=False)
 
-        # Transform here so it can be sortted on later
+        # Transform here so it can be sorted on later
         if data['modified'] is not None and data['modified'] != '':
             data['modified'] = parse_date(
                 data['modified'],
@@ -517,7 +517,7 @@ def update(self, revision, data, user=None, save=True):
         for entry in self.history:
             # Some entry might have an undefined modified field
             if data['modified'] is not None and entry['modified'] is not None and data['modified'] < entry['modified']:
-                sentry.log_message('update() receives metatdata older than the newest entry in file history.')
+                sentry.log_message('update() receives metadata older than the newest entry in file history.')
             if ('etag' in entry and 'etag' in data) and (entry['etag'] == data['etag']):
                 break
         else:
@@ -574,7 +574,7 @@ def last_known_metadata(self):
 
     @property
     def _hashes(self):
-        """ Hook for sublasses to return file hashes, commit SHAs, etc.
+        """ Hook for subclasses to return file hashes, commit SHAs, etc.
         Returns dict or None
         """
         return None
@@ -780,7 +780,7 @@ class FileVersion(ObjectIDMixin, BaseModel):
     """
     # Note on fields:
     # `created`: Date version record was created. This is the date displayed to the user.
-    # `modified`: Date this object was last modified. Distinct from the date the file associated
+    # `modified`: Date this object was last modified. Distinct from the date that the file associated
     #       with this object was last modified
     # `external_modified`: Date file modified on third-party backend. Not displayed to user, since
     #       this date may be earlier than the date of upload if the file already
@@ -854,7 +854,7 @@ def is_duplicate(self, other):
         return self.location_hash == other.location_hash
 
     def get_basefilenode_version(self, file):
-        # Returns the throughtable object  - the record that links this version
+        # Returns the through table object  - the record that links this version
         # to the given file.
         return self.basefileversionsthrough_set.filter(basefilenode=file).first()
 
diff --git a/osf/models/identifiers.py b/osf/models/identifiers.py
index 49be9f9c45b..ab641eb5279 100644
--- a/osf/models/identifiers.py
+++ b/osf/models/identifiers.py
@@ -68,7 +68,7 @@ class IdentifierMixin(models.Model):
 
     @property
     def should_request_identifiers(self):
-        """Determines if a identifier should be requested, Bool.
+        """Determines if an identifier should be requested, Bool.
         """
         raise NotImplementedError()
 
diff --git a/osf/models/institution.py b/osf/models/institution.py
index 5dce3c1df36..34db53bf0ff 100644
--- a/osf/models/institution.py
+++ b/osf/models/institution.py
@@ -272,7 +272,7 @@ def get_semantic_iri(self) -> str:
             return self.ror_uri
         if self.identifier_domain:  # if not ROR, at least URI
             return self.identifier_domain
-        # fallback to a url on osf
+        # fall back to a url on osf
         return self.absolute_url
 
     def get_semantic_iris(self) -> Iterable[str]:
diff --git a/osf/models/metaschema.py b/osf/models/metaschema.py
index 565bd2f182d..33973ede790 100644
--- a/osf/models/metaschema.py
+++ b/osf/models/metaschema.py
@@ -31,7 +31,7 @@
 
 def allow_egap_admins(queryset, request):
     """
-    Allows egap admins to see EGAP registrations as visible, should be deleted when when the EGAP registry goes
+    Allows egap admins to see EGAP registrations as visible, should be deleted when the EGAP registry goes
     live.
     """
     if hasattr(request, 'user') and not flag_is_active(request, EGAP_ADMINS):
diff --git a/osf/models/mixins.py b/osf/models/mixins.py
index 0e351edcd1b..af914dcdcc4 100644
--- a/osf/models/mixins.py
+++ b/osf/models/mixins.py
@@ -175,7 +175,7 @@ def set_title(self, title, auth, save=False, allow_blank=False):
 
         original_title = self.title
         new_title = sanitize.strip_html(title)
-        # Title hasn't changed after sanitzation, bail out
+        # Title hasn't changed after sanitization, bail out
         if original_title == new_title:
             return False
         self.title = new_title
@@ -213,7 +213,7 @@ def log_params(self):
     def set_description(self, description, auth, save=False):
         """Set the description and log the event.
         :param str description: The new description
-        :param auth: All the auth informtion including user, API key.
+        :param auth: All the auth information including user, API key.
         :param bool save: Save self after updating.
         """
         original = self.description
@@ -272,7 +272,7 @@ def log_params(self):
     def set_category(self, category, auth, save=False):
         """Set the category and log the event.
         :param str category: The new category
-        :param auth: All the auth informtion including user, API key.
+        :param auth: All the auth information including user, API key.
         :param bool save: Save self after updating.
         """
         original = self.category
@@ -511,7 +511,7 @@ def addons(self):
     def get_addons(self, service_type: str | None = None, in_request_context: bool = True, auth=None):
         '''
         This gets all a user's addons whether that user is the model user (self.) or the user making the request (the
-        user signing off on whatever auth mechicanism such as token or basic auth.
+        user signing off on whatever auth mechanism such as token or basic auth.
 
         service_type is the addon type such as "storage" or "citations"
         in_request_context is the addon for the requesting user? or is it outside the request context.
@@ -1509,7 +1509,7 @@ def add_unregistered_contributor(self, fullname, email, auth, send_email=None,
         :param str fullname: The full name of the person.
         :param str email: The email address of the person.
         :param Auth auth: Auth object for the user adding the contributor.
-        :param User existing_user: the unregister_contributor if it is already created, otherwise None
+        :param User existing_user: the unregister_contributor if it is already created; otherwise, None
         :returns: The added contributor
         :raises: DuplicateEmailError if user with given email is already in the database.
         """
@@ -1644,7 +1644,7 @@ def copy_unclaimed_records(self, resource):
                 contributor.save()
 
     # TODO: optimize me
-    def update_contributor(self, user, permission, visible, auth, save=False):
+    def update_contributor(self, user, permission, visible, auth, save=False, skip_permission=False):
         """ TODO: this method should be updated as a replacement for the main loop of
         Node#manage_contributors. Right now there are redundancies, but to avoid major
         feature creep this will not be included as this time.
@@ -1653,7 +1653,7 @@ def update_contributor(self, user, permission, visible, auth, save=False):
         """
         OSFUser = apps.get_model('osf.OSFUser')
 
-        if not self.has_permission(auth.user, ADMIN):
+        if not skip_permission and not self.has_permission(auth.user, ADMIN):
             raise PermissionsError('Only admins can modify contributor permissions')
 
         if permission:
@@ -2165,7 +2165,7 @@ def confirm_ham(self, save=False, train_spam_services=True):
 
     def _get_spam_content(self, saved_fields=None, include_tags=True):
         """
-        This function retrieves retrieves strings of potential spam from various DB fields. Also here we can follow
+        This function retrieves strings of potential spam from various DB fields. Also here we can follow
         django's typical ORM query structure for example we can grab the redirect link of a node by giving a saved
         field of {'addons_forward_node_settings__url'}.
 
diff --git a/osf/models/node.py b/osf/models/node.py
index 7aee1cb0880..2345708934e 100644
--- a/osf/models/node.py
+++ b/osf/models/node.py
@@ -991,13 +991,17 @@ def all_tags(self):
         # Tag's default manager only returns non-system tags, so we can't use self.tags
         return Tag.all_tags.filter(abstractnode_tagged=self)
 
+    @property
+    def system_tags_objects(self):
+        return self.all_tags.filter(system=True)
+
     @property
     def system_tags(self):
         """The system tags associated with this node. This currently returns a list of string
         names for the tags, for compatibility with v1. Eventually, we can just return the
         QuerySet.
         """
-        return self.all_tags.filter(system=True).values_list('name', flat=True)
+        return self.system_tags_objects.values_list('name', flat=True)
 
     # Override Taggable
     def add_tag_log(self, tag, auth):
@@ -1019,10 +1023,15 @@ def on_tag_added(self, tag):
     def remove_tag(self, tag, auth, save=True):
         if not tag:
             raise InvalidTagError
-        elif not self.tags.filter(name=tag).exists():
+
+        tag_obj = self.tags.filter(name=tag).first() or self.all_tags.filter(name=tag).first()
+        if not tag_obj:
             raise TagNotFoundError
+
+        if tag_obj.system:
+            # because system tags are hidden by default TagManager
+            tag_obj.delete()
         else:
-            tag_obj = Tag.objects.get(name=tag)
             self.tags.remove(tag_obj)
             self.add_log(
                 action=NodeLog.TAG_REMOVED,
@@ -1034,10 +1043,12 @@ def remove_tag(self, tag, auth, save=True):
                 auth=auth,
                 save=False,
             )
-            if save:
-                self.save()
-            self.update_search()
-            return True
+
+        if save:
+            self.save()
+
+        self.update_search()
+        return True
 
     def remove_tags(self, tags, auth, save=True):
         """
@@ -1310,7 +1321,7 @@ def get_root(self):
             return self
 
     def find_readable_antecedent(self, auth):
-        """ Returns first antecendant node readable by <user>.
+        """ Returns first antecedent node readable by <user>.
         """
         next_parent = self.parent_node
         while next_parent:
@@ -1319,7 +1330,7 @@ def find_readable_antecedent(self, auth):
             next_parent = next_parent.parent_node
 
     def copy_contributors_from(self, resource):
-        """Copies the contibutors from node (including permissions and visibility) into this node."""
+        """Copies the contributors from node (including permissions and visibility) into this node."""
         contribs = []
         current_contributors = self.contributor_set.values_list('user_id', flat=True)
         for contrib in resource.contributor_set.all():
@@ -1821,7 +1832,7 @@ def use_as_template(self, auth, changes=None, top_level=True, parent=None):
 
     def next_descendants(self, auth, condition=lambda auth, node: True):
         """
-        Recursively find the first set of descedants under a given node that meet a given condition
+        Recursively find the first set of descendents under a given node that meet a given condition
 
         returns a list of [(node, [children]), ...]
         """
@@ -1997,7 +2008,7 @@ def set_title(self, title, auth, save=False):
 
         original_title = self.title
         new_title = sanitize.strip_html(title)
-        # Title hasn't changed after sanitzation, bail out
+        # Title hasn't changed after sanitization, bail out
         if original_title == new_title:
             return False
         self.title = new_title
@@ -2020,7 +2031,7 @@ def set_description(self, description, auth, save=False):
         """Set the description and log the event.
 
         :param str description: The new description
-        :param auth: All the auth informtion including user, API key.
+        :param auth: All the auth information including user, API key.
         :param bool save: Save self after updating.
         """
         original = self.description
@@ -2047,7 +2058,7 @@ def set_category(self, category, auth, save=False):
         """Set the category and log the event.
 
         :param str category: The new category
-        :param auth: All the auth informtion including user, API key.
+        :param auth: All the auth information including user, API key.
         :param bool save: Save self after updating.
         """
         original = self.category
@@ -2074,7 +2085,7 @@ def set_article_doi(self, article_doi, auth, save=False):
         """Set the article_doi and log the event.
 
         :param str article_doi: The new article doi
-        :param auth: All the auth informtion including user, API key.
+        :param auth: All the auth information including user, API key.
         :param bool save: Save self after updating.
         """
         original = self.article_doi
@@ -2152,8 +2163,8 @@ def update(self, fields, auth=None, save=True):
                         # This is in place because historically projects and components
                         # live on different ElasticSearch indexes, and at the time of Node.save
                         # there is no reliable way to check what the old Node.category
-                        # value was. When the cateogory changes it is possible to have duplicate/dead
-                        # search entries, so always delete the ES doc on categoryt change
+                        # value was. When the category changes it is possible to have duplicate/dead
+                        # search entries, so always delete the ES doc on category change
                         # TODO: consolidate Node indexes into a single index, refactor search
                         if key == 'category':
                             self.delete_search_entry()
diff --git a/osf/models/nodelog.py b/osf/models/nodelog.py
index 0297c42bdec..6aa14f461e5 100644
--- a/osf/models/nodelog.py
+++ b/osf/models/nodelog.py
@@ -86,6 +86,7 @@ class NodeLog(ObjectIDMixin, BaseModel):
 
     CATEGORY_UPDATED = 'category_updated'
     ARTICLE_DOI_UPDATED = 'article_doi_updated'
+    REGISTRATION_DATE_UPDATED = 'registration_date_updated'
 
     ADDON_ADDED = 'addon_added'
     ADDON_REMOVED = 'addon_removed'
@@ -143,7 +144,7 @@ class NodeLog(ObjectIDMixin, BaseModel):
     MIGRATED_QUICK_FILES = 'migrated_quickfiles'
 
     RESOURCE_ADDED = 'resource_identifier_added'
-    RESOURCE_UPDATED = 'resource_identifier_udpated'
+    RESOURCE_UPDATED = 'resource_identifier_updated'
     RESOURCE_REMOVED = 'resource_identifier_removed'
 
     actions = ([CHECKED_IN, CHECKED_OUT, FILE_TAG_REMOVED, FILE_TAG_ADDED, CREATED_FROM, PROJECT_CREATED,
@@ -153,7 +154,7 @@ class NodeLog(ObjectIDMixin, BaseModel):
                 WIKI_DELETED, WIKI_RENAMED, MADE_WIKI_PUBLIC,
                 MADE_WIKI_PRIVATE, CONTRIB_ADDED, CONTRIB_REMOVED, CONTRIB_REORDERED, CURATOR_ADDED, CURATOR_REMOVED,
                 PERMISSIONS_UPDATED, MADE_PRIVATE, MADE_PUBLIC, TAG_ADDED, TAG_REMOVED, EDITED_TITLE,
-                EDITED_DESCRIPTION, UPDATED_FIELDS, FILE_MOVED, FILE_COPIED, FILE_METADATA_UPDATED,
+                EDITED_DESCRIPTION, REGISTRATION_DATE_UPDATED, UPDATED_FIELDS, FILE_MOVED, FILE_COPIED, FILE_METADATA_UPDATED,
                 FOLDER_CREATED, FILE_ADDED, FILE_UPDATED, FILE_REMOVED, FILE_RESTORED, ADDON_ADDED,
                 ADDON_REMOVED, COMMENT_ADDED, COMMENT_REMOVED, COMMENT_UPDATED, COMMENT_RESTORED,
                 MADE_CONTRIBUTOR_VISIBLE, CONFIRM_HAM, FLAG_SPAM, CONFIRM_SPAM,
diff --git a/osf/models/notable_domain.py b/osf/models/notable_domain.py
index 03ebcfd6e40..821eb910a0c 100644
--- a/osf/models/notable_domain.py
+++ b/osf/models/notable_domain.py
@@ -14,7 +14,7 @@ class Note(IntEnum):
         ASSUME_HAM_UNTIL_REPORTED = 1
         UNKNOWN = 2
         IGNORED = 3
-        UNVERIFIED = 4  # Timedout couldn't determine
+        UNVERIFIED = 4  # Timed out couldn't determine
 
         @classmethod
         def choices(cls):
diff --git a/osf/models/preprint.py b/osf/models/preprint.py
index 6765aa0a275..49c16e69f43 100644
--- a/osf/models/preprint.py
+++ b/osf/models/preprint.py
@@ -383,14 +383,18 @@ def create(cls, provider, title, creator, description, manual_guid=None, manual_
 
     def get_last_not_rejected_version(self):
         """Get the last version that is not rejected.
+        Returns None if all versions are rejected.
         """
-        return self.get_guid().versions.filter(is_rejected=False).order_by('-version').first().referent
+        last_not_rejected = self.get_guid().versions.filter(is_rejected=False).order_by('-version').first()
+        return last_not_rejected.referent if last_not_rejected else None
 
     def has_unpublished_pending_version(self):
         """Check if preprint has pending unpublished version.
         Note: use `.check_unfinished_or_unpublished_version()` if checking both types
         """
         last_not_rejected_version = self.get_last_not_rejected_version()
+        if not last_not_rejected_version:
+            return False
         return not last_not_rejected_version.date_published and last_not_rejected_version.machine_state == 'pending'
 
     def has_initiated_but_unfinished_version(self):
@@ -529,6 +533,7 @@ def create_version(cls, create_from_guid, auth, assign_version_number=None, igno
                     referrer=auth.user,
                     email=contributor.user.email,
                     given_name=contributor.user.fullname,
+                    skip_referrer_permissions=auth.user.groups.filter(name='osf_admin').exists()
                 )
             except ValidationError as e:
                 sentry.log_exception(e)
@@ -695,6 +700,24 @@ def is_preprint_orphan(self):
     def has_submitted_preprint(self):
         return self.machine_state != DefaultStates.INITIAL.value
 
+    @property
+    def is_pending_moderation(self):
+        if self.machine_state == DefaultStates.INITIAL.value:
+            return False
+
+        if not self.provider or not self.provider.reviews_workflow:
+            return False
+
+        from api.providers.workflows import PUBLIC_STATES
+
+        workflow = self.provider.reviews_workflow
+        public_states = PUBLIC_STATES.get(workflow, [])
+
+        if self.machine_state not in public_states:
+            return True
+
+        return False
+
     @property
     def deep_url(self):
         # Required for GUID routing
@@ -776,6 +799,22 @@ def csl(self):  # formats node information into CSL format for citation parsing
     def is_latest_version(self):
         return self.guids.exists()
 
+    @property
+    def date_created_first_version(self):
+        try:
+            base_guid = self.versioned_guids.first().guid if self.versioned_guids.exists() else None
+            if not base_guid:
+                return self.created
+
+            first_version = base_guid.versions.order_by('version').first()
+
+            if first_version and first_version.referent:
+                return first_version.referent.created
+
+            return self.created
+        except Exception:
+            return self.created
+
     def get_preprint_versions(self, include_rejected=True, **version_filters):
         guids = self.versioned_guids.first().guid.versions.all()
         preprint_versions = (
@@ -798,6 +837,12 @@ def api_url_for(self, view_name, _absolute=False, *args, **kwargs):
     def get_absolute_url(self):
         return self.absolute_api_v2_url
 
+    def get_versioned_absolute_api_v2_url(self, version):
+        if self.guids.first().versions.filter(version=version).exists():
+            path = f'/preprints/{self.guids.first()._id}{VersionedGuidMixin.GUID_VERSION_DELIMITER}{version}/'
+            return api_v2_url(path)
+        return None
+
     def add_log(self, action, params, auth, foreign_user=None, log_date=None, save=True, request=None, should_hide=False):
         user = None
         if auth:
@@ -1069,13 +1114,17 @@ def all_tags(self):
         # Tag's default manager only returns non-system tags, so we can't use self.tags
         return Tag.all_tags.filter(preprint_tagged=self)
 
+    @property
+    def system_tags_objects(self):
+        return self.all_tags.filter(system=True)
+
     @property
     def system_tags(self):
         """The system tags associated with this node. This currently returns a list of string
         names for the tags, for compatibility with v1. Eventually, we can just return the
         QuerySet.
         """
-        return self.all_tags.filter(system=True).values_list('name', flat=True)
+        return self.system_tags_objects.values_list('name', flat=True)
 
     # Override Taggable
     def add_tag_log(self, tag, auth):
@@ -1096,10 +1145,15 @@ def on_tag_added(self, tag):
     def remove_tag(self, tag, auth, save=True):
         if not tag:
             raise InvalidTagError
-        elif not self.tags.filter(name=tag).exists():
+
+        tag_obj = self.tags.filter(name=tag).first() or self.all_tags.filter(name=tag).first()
+        if not tag_obj:
             raise TagNotFoundError
+
+        if tag_obj.system:
+            # because system tags are hidden by default TagManager
+            tag_obj.delete()
         else:
-            tag_obj = Tag.objects.get(name=tag)
             self.tags.remove(tag_obj)
             self.add_log(
                 action=PreprintLog.TAG_REMOVED,
@@ -1110,10 +1164,12 @@ def remove_tag(self, tag, auth, save=True):
                 auth=auth,
                 save=False,
             )
-            if save:
-                self.save()
-            update_or_enqueue_on_preprint_updated(preprint_id=self._id, saved_fields=['tags'])
-            return True
+
+        if save:
+            self.save()
+
+        update_or_enqueue_on_preprint_updated(preprint_id=self._id, saved_fields=['tags'])
+        return True
 
     @require_permission([WRITE])
     def set_supplemental_node(self, node, auth, save=False, ignore_node_permissions=False, **kwargs):
@@ -1170,7 +1226,7 @@ def set_description(self, description, auth, save=False, **kwargs):
         """Set the description and log the event.
 
         :param str description: The new description
-        :param auth: All the auth informtion including user, API key.
+        :param auth: All the auth information including user, API key.
         :param bool save: Save self after updating.
         """
         return super().set_description(description, auth, save)
@@ -1400,7 +1456,7 @@ def update_conflict_of_interest_statement(self, auth: Auth, coi_statement: str,
     @require_permission([ADMIN])
     def update_has_data_links(self, auth: Auth, has_data_links: bool, log: bool = True, save: bool = True, **kwargs):
         """
-        This method sets the `has_data_links` field that respresent the availability of links to supplementary data
+        This method sets the `has_data_links` field that represent the availability of links to supplementary data
         for this preprint and logs that change.
 
         :param auth: Auth object
diff --git a/osf/models/queued_mail.py b/osf/models/queued_mail.py
index 844465d5193..5d521366995 100644
--- a/osf/models/queued_mail.py
+++ b/osf/models/queued_mail.py
@@ -108,7 +108,7 @@ def queue_mail(to_addr, mail, send_at, user, **context):
 #EMAIL_TYPE = {
 #    'template': the mako template used for email_type,
 #    'subject': subject used for the actual email,
-#    'categories': categories to attach to the email using Sendgrid's SMTPAPI.
+#    'categories': categories to attach to the email using SendGrid's SMTPAPI.
 #    'engagement': Whether this is an engagement email that can be disabled with the disable_engagement_emails waffle flag
 #    'presend': predicate function that determines whether an email should be sent. May also
 #               modify mail.data.
diff --git a/osf/models/registration_bulk_upload_job.py b/osf/models/registration_bulk_upload_job.py
index 4dd99fd344d..a8ab9a39d9a 100644
--- a/osf/models/registration_bulk_upload_job.py
+++ b/osf/models/registration_bulk_upload_job.py
@@ -14,7 +14,7 @@ class JobState(IntEnum):
     INITIALIZED = 1  # Database preparation has been finished and is ready to be picked up
     PICKED_UP = 2  # Registration creation is in progress
     DONE_FULL = 3  # All (draft) registrations have been successfully created
-    DONE_PARTIAL = 4  # Some (draft) registrations have failed the creation creation process
+    DONE_PARTIAL = 4  # Some (draft) registrations have failed the creation process
     DONE_ERROR = 5  # All (draft) registrations have failed
 
 
diff --git a/osf/models/registrations.py b/osf/models/registrations.py
index d74260358f4..79e6547c939 100644
--- a/osf/models/registrations.py
+++ b/osf/models/registrations.py
@@ -345,7 +345,7 @@ def is_moderated(self):
     def updatable(self):
         '''Boolean that tells whether a Registration should support adding new SchemaResponses.
 
-        By convention, in order to allow internal flexiblity, this is used to limit creation of
+        By convention, in order to allow internal flexibility, this is used to limit creation of
         SchemaResponses through the API but not on the models.
         '''
         if self.deleted or self.is_retracted:
@@ -385,8 +385,8 @@ def available_providers(self):
     def provider_specific_metadata(self):
         """Surfaces the additional_metadata fields supported by the provider.
 
-        Also formats the reults to inherit any additional field descriptors defined
-        by the provider and to simplify consumpption by the APIt.
+        Also formats the results to inherit any additional field descriptors defined
+        by the provider and to simplify consumption by the API.
         """
         additional_metadata = self.additional_metadata or {}
 
@@ -758,7 +758,7 @@ def _write_registration_action(self, from_state, to_state, initiated_by, comment
         if trigger is None:
             return  # Not a moderated event, no need to write an action
 
-        # IF fegistration is moving into moderation, "creator" should reflect the
+        # IF registration is moving into moderation, "creator" should reflect the
         # Registration Admin who initiated the Registration/Withdrawal
         if not initiated_by or trigger in [
                 RegistrationModerationTriggers.SUBMIT,
@@ -871,7 +871,7 @@ def copy_registration_responses_into_schema_response(self, draft_registration=No
             if save:
                 self.save()
 
-        if self.root_id == self.id:  # only create SchemaResposnes on the root registration
+        if self.root_id == self.id:  # only create SchemaResponses on the root registration
             schema_response = SchemaResponse.create_initial_response(
                 self.creator,
                 self,
@@ -1317,13 +1317,17 @@ def all_tags(self):
         # Tag's default manager only returns non-system tags, so we can't use self.tags
         return Tag.all_tags.filter(draftregistration_tagged=self)
 
+    @property
+    def system_tags_objects(self):
+        return self.all_tags.filter(system=True)
+
     @property
     def system_tags(self):
         """The system tags associated with this draft registration. This currently returns a list of string
         names for the tags, for compatibility with v1. Eventually, we can just return the
         QuerySet.
         """
-        return self.all_tags.filter(system=True).values_list('name', flat=True)
+        return self.system_tags_objects.values_list('name', flat=True)
 
     @classmethod
     def create_from_node(cls, user, schema, node=None, data=None, provider=None):
@@ -1379,7 +1383,7 @@ def get_root(self):
 
     def copy_contributors_from(self, resource):
         """
-        Copies the contibutors from the resource (including permissions and visibility)
+        Copies the contributors from the resource (including permissions and visibility)
         into this draft registration.
         Visibility, order, draft, and user are stored in DraftRegistrationContributor table.
         Permissions are stored in guardian tables (use add_permission)
diff --git a/osf/models/sanctions.py b/osf/models/sanctions.py
index 6d8b904b4b9..4744f6553c2 100644
--- a/osf/models/sanctions.py
+++ b/osf/models/sanctions.py
@@ -354,7 +354,7 @@ class EmailApprovableSanction(TokenApprovableSanction):
 
     # A flag to conditionally run a callback on complete
     notify_initiator_on_complete = models.BooleanField(default=False)
-    # Store a persistant copy of urls for use when needed outside of a request context.
+    # Store a persistent copy of urls for use when needed outside of a request context.
     # This field gets automagically updated whenever models approval_state is modified
     # and the model is saved
     # {
@@ -592,7 +592,7 @@ def _on_reject(self, event_data):
         if not self.for_existing_registration:
             parent_registration.delete_registration_tree(save=True)
             parent_registration.registered_from = None
-        # Delete parent registration if it was created at the time the embargo was initiated
+        # Delete parent registration if it was created at the time that the embargo was initiated
         if not self.for_existing_registration:
             parent_registration.is_deleted = True
             parent_registration.deleted = timezone.now()
diff --git a/osf/models/schema_response.py b/osf/models/schema_response.py
index 4fa5289f2d4..086f5f5649f 100644
--- a/osf/models/schema_response.py
+++ b/osf/models/schema_response.py
@@ -185,7 +185,7 @@ def create_from_previous_response(cls, initiator, previous_response, justificati
 
         On creation, the new SchemaResponses will share all of its response_blocks with the
         previous_version (as no responses have changed). As responses are updated via
-        response.update_responses, new SchemaResponseBlocks will be created/updated as apporpriate.
+        response.update_responses, new SchemaResponseBlocks will be created/updated as appropriate.
 
         A new SchemaResponse cannot be created for a given parent object if it already has another
         SchemaResponse in a non-APPROVED state.
@@ -220,7 +220,7 @@ def update_responses(self, updated_responses):
         answer and added to response_blocks, and the outdated response_block entry for that key
         (inherited from the previous_response) will be removed from response_blocks.
 
-        If a previously updated response is udpated again, the existing entry in response_blocks
+        If a previously updated response is updated again, the existing entry in response_blocks
         for that key will have its "response" field updated to the new value.
 
         If a previously updated response has its answer reverted to the previous_response's answer,
@@ -301,7 +301,7 @@ def delete(self, *args, **kwargs):
             )
         super().delete(*args, **kwargs)
 
-# *** Callbcks in support of ApprovalsMachine ***
+# *** Callbacks in support of ApprovalsMachine ***
 
     def _validate_trigger(self, event_data):
         '''Any additional validation to confirm that a trigger is being used correctly.
@@ -337,7 +337,7 @@ def _validate_submit_trigger(self, user):
                 f'and does not have permission to "submit" SchemaResponse with id [{self._id}]'
             )
 
-        # Only check newly udpated keys, as old keys have previously passed validation
+        # Only check newly updated keys, as old keys have previously passed validation
         invalid_response_keys = [
             block.schema_key for block in self.updated_response_blocks.all() if not block.is_valid()
         ]
@@ -389,7 +389,7 @@ def _validate_accept_trigger(self, user):
 
         if not user.has_perm('accept_submissions', self.parent.provider):
             raise PermissionsError(
-                f'User {user} is not a modrator on {self.parent.provider} and does not '
+                f'User {user} is not a moderator on {self.parent.provider} and does not '
                 f'have permission to "accept" SchemaResponse with id [{self._id}]'
             )
 
@@ -410,7 +410,7 @@ def _validate_reject_trigger(self, user):
 
         if not user.has_perm('reject_submissions', self.parent.provider):
             raise PermissionsError(
-                f'User {user} is not a modrator on {self.parent.provider} and does not '
+                f'User {user} is not a moderator on {self.parent.provider} and does not '
                 f'have permission to "reject" SchemaResponse with id [{self._id}]'
             )
 
@@ -517,7 +517,7 @@ def _is_updated_response(response_block, new_response):
     if response_block.source_schema_block.block_type != 'file-input':
         return current_response != new_response
 
-    # `files-input` blocks contain a list of dictinoaries containinf file information in the form
+    # `files-input` blocks contain a list of dictionaries containing file information in the form
     current_file_ids = {entry['file_id'] for entry in current_response}
     new_file_ids = {entry['file_id'] for entry in new_response}
     return current_file_ids != new_file_ids
diff --git a/osf/models/user.py b/osf/models/user.py
index a27f7aca3b3..6fcfbb6e159 100644
--- a/osf/models/user.py
+++ b/osf/models/user.py
@@ -40,7 +40,13 @@
     translations as gv_translations,
 )
 from osf.utils.requests import get_current_request
-from osf.exceptions import reraise_django_validation_errors, UserStateError
+from osf.exceptions import (
+    reraise_django_validation_errors,
+    UserStateError,
+    InvalidTagError,
+    TagNotFoundError
+)
+
 from .base import BaseModel, GuidMixin, GuidMixinQuerySet
 from .notable_domain import NotableDomain
 from .contributor import Contributor, RecentlyAddedContributor
@@ -356,7 +362,7 @@ class OSFUser(DirtyFieldsMixin, GuidMixin, BaseModel, AbstractBaseUser, Permissi
     #     'scholar': <google scholar identifier>,
     #     'ssrn': <SSRN username>,
     #     'researchGate': <researchGate username>,
-    #     'baiduScholar': <bauduScholar username>,
+    #     'baiduScholar': <baiduScholar username>,
     #     'academiaProfileID': <profile identifier for academia.edu>
     # }
 
@@ -530,13 +536,17 @@ def all_tags(self):
         # Tag's default manager only returns non-system tags, so we can't use self.tags
         return Tag.all_tags.filter(osfuser=self)
 
+    @property
+    def system_tags_objects(self):
+        return self.all_tags.filter(system=True)
+
     @property
     def system_tags(self):
         """The system tags associated with this node. This currently returns a list of string
         names for the tags, for compatibility with v1. Eventually, we can just return the
         QuerySet.
         """
-        return self.all_tags.filter(system=True).values_list('name', flat=True)
+        return self.system_tags_objects.values_list('name', flat=True)
 
     @property
     def csl_given_name(self):
@@ -1092,7 +1102,7 @@ def create_unconfirmed(cls, username, password, fullname, external_identity=None
         if external_identity:
             user.external_identity.update(external_identity)
         if campaign:
-            # needed to prevent cirular import
+            # needed to prevent circular import
             from framework.auth.campaigns import system_tag_for_campaign  # skipci
             # User needs to be saved before adding system tags (due to m2m relationship)
             user.save()
@@ -1178,7 +1188,7 @@ def verify_password_token(self, token):
         Verify that the password reset token for this user is valid.
 
         :param token: the token in verification key
-        :return `True` if valid, otherwise `False`
+        :return `True` if valid; otherwise, `False`
         """
 
         if token and self.verification_key_v2:
@@ -1191,7 +1201,7 @@ def verify_password_token(self, token):
 
     def verify_claim_token(self, token, project_id):
         """Return whether or not a claim token is valid for this user for
-        a given node which they were added as a unregistered contributor for.
+        a given node which they were added as an unregistered contributor for.
         """
         try:
             record = self.get_unclaimed_record(project_id)
@@ -1217,7 +1227,7 @@ def create_unregistered(cls, fullname, email=None):
         return user
 
     def update_guessed_names(self):
-        """Updates the CSL name fields inferred from the the full name.
+        """Updates the CSL name fields inferred from the full name.
         """
         parsed = impute_names(self.fullname)
         self.given_name = parsed['given']
@@ -1600,6 +1610,25 @@ def add_system_tag(self, tag):
             self.tags.add(tag_instance)
         return tag_instance
 
+    def remove_tag(self, tag, auth, save=True):
+        if not tag:
+            raise InvalidTagError
+
+        tag_instance = self.all_tags.filter(name=tag).first()
+        if not tag_instance:
+            raise TagNotFoundError
+
+        if not tag_instance.system:
+            raise ValueError('Non-system tag passed to add_system_tag')
+
+        # because system tags are hidden by default TagManager
+        tag_instance.delete()
+        if save:
+            self.save()
+
+        self.update_search()
+        return True
+
     def get_recently_added(self):
         return (
             each.contributor
@@ -1988,13 +2017,34 @@ def gdpr_delete(self):
     def _validate_no_public_entities(self):
         """
         Ensure that the user doesn't have any public facing resources like Registrations or Preprints
+        that would be left with other contributors after this deletion.
+
+        Allow GDPR deletion if the user is the sole contributor on a public Registration or Preprint.
         """
-        from osf.models import Preprint
+        from osf.models import Preprint, AbstractNode
+
+        registrations_with_others = AbstractNode.objects.annotate(
+            contrib_count=Count('_contributors', distinct=True),
+        ).filter(
+            _contributors=self,
+            deleted__isnull=True,
+            type='osf.registration',
+            contrib_count__gt=1
+        ).exists()
 
-        if self.nodes.filter(deleted__isnull=True, type='osf.registration').exists():
+        if registrations_with_others:
             raise UserStateError('You cannot delete this user because they have one or more registrations.')
 
-        if Preprint.objects.filter(_contributors=self, ever_public=True, deleted__isnull=True).exists():
+        preprints_with_others = Preprint.objects.annotate(
+            contrib_count=Count('_contributors', distinct=True),
+        ).filter(
+            _contributors=self,
+            ever_public=True,
+            deleted__isnull=True,
+            contrib_count__gt=1
+        ).exists()
+
+        if preprints_with_others:
             raise UserStateError('You cannot delete this user because they have one or more preprints.')
 
     def _validate_and_remove_resource_for_gdpr_delete(self, resources, hard_delete):
@@ -2003,7 +2053,7 @@ def _validate_and_remove_resource_for_gdpr_delete(self, resources, hard_delete):
 
         Args:
         - resources: A queryset of resources probably of AbstractNode or DraftRegistration.
-        - hard_delete: A boolean indicating whether the resource should be permentently deleted or just marked as such.
+        - hard_delete: A boolean indicating whether the resource should be permanently deleted or just marked as such.
         """
         model = resources.query.model
 
diff --git a/osf/models/validators.py b/osf/models/validators.py
index 87f00f826a6..67261a0ed12 100644
--- a/osf/models/validators.py
+++ b/osf/models/validators.py
@@ -351,7 +351,7 @@ def _get_multiple_choice_options(self, question):
         an array with the possible multiple choice answers for a given question.
         Schema blocks are linked by schema_block_group_keys, so fetches multiple choice options
         with the same schema_block_group_key as the given question
-        :question SchemaBlock with an registration_response_key
+        :question SchemaBlock with a registration_response_key
         """
         options = [
             block.display_text
diff --git a/osf/utils/machines.py b/osf/utils/machines.py
index 04713b3cb26..5c53b1dd919 100644
--- a/osf/utils/machines.py
+++ b/osf/utils/machines.py
@@ -38,7 +38,7 @@ class BaseMachine(Machine):
 
     def __init__(self, machineable, state_attr='machine_state'):
         """
-        Welcome to the machine, this is our attempt at a state machine. It was written for nodes, prerprints etc,
+        Welcome to the machine, this is our attempt at a state machine. It was written for nodes, preprints etc,
         but sometimes applies to sanctions, it may be to applied to anything that wants to have states and transitions.
 
         The general idea behind this is that we are instantiating the machine object as part of the model and it will
@@ -345,7 +345,7 @@ class ApprovalsMachine(Machine):
     The valid machine states for a Sanction object are defined in Workflows.ApprovalStates.
     The valid transitions between these states are defined in Workflows.APPROVAL_TRANSITIONS.
 
-    The ApprovaslMachine can be used by by instantiating an ApprovalsMachine and attaching the
+    The ApprovalsMachine can be used by by instantiating an ApprovalsMachine and attaching the
     desired model with the 'model' kwarg. Attached models will inherit the 'trigger' functions
     named in the APPROVAL_TRANSITIONS dictionary (submit, approve, accept, and reject).
 
@@ -356,9 +356,9 @@ class ApprovalsMachine(Machine):
     4) Update the state field of the Sanction object via the approval_stage setter
     5) Call Sanction member functions listed in the 'after' key of the dictionary
 
-    Attached models must define the callbacks used by the ApprvalsMachine:
+    Attached models must define the callbacks used by the ApprovalsMachine:
     * is_moderated: Determines what transition to follow from `accept` and `reject` triggers
-    * revisable: Determines what transiition to follow on a 'reject' trigger
+    * revisable: Determines what transition to follow on a 'reject' trigger
     * `_on_submit', '_on_approve', '_on_complete', and '_on_reject': Define any custom per-trigger logic
     * _save_transition': Defines any global, post-transition logic
 
diff --git a/osf/utils/migrations.py b/osf/utils/migrations.py
index 820d62fbfdc..f89b896904e 100644
--- a/osf/utils/migrations.py
+++ b/osf/utils/migrations.py
@@ -392,7 +392,7 @@ def create_schema_blocks_for_question(state, rs, question, sub=False):
 
 def create_schema_blocks_for_atomic_schema(schema):
     """
-    Atomic schemas are a short cut around making an typical metaschemas by being totally explict about the schemablocks
+    Atomic schemas are a short cut around making a typical metaschemas by being totally explicit about the schemablocks
     being created.
     """
 
diff --git a/osf_tests/embargoes/test_embargoes.py b/osf_tests/embargoes/test_embargoes.py
index 468f5b03aaf..c99c6443743 100644
--- a/osf_tests/embargoes/test_embargoes.py
+++ b/osf_tests/embargoes/test_embargoes.py
@@ -33,7 +33,7 @@ def registration(self, user):
     def test_request_early_termination_too_late(self, registration, user):
         """
         This is for an edge case test for where embargos are frozen and never expire when the user requests they be
-        terminated with embargo with less then 48 hours before it would expire anyway.
+        terminated with embargo with less than 48 hours before it would expire anyway.
         """
 
         registration.request_embargo_termination(user)
diff --git a/osf_tests/external/akismet/test_akismet.py b/osf_tests/external/akismet/test_akismet.py
index 46729e485e8..95b119c2651 100644
--- a/osf_tests/external/akismet/test_akismet.py
+++ b/osf_tests/external/akismet/test_akismet.py
@@ -44,7 +44,7 @@ def test_get_spam_content(self, user):
 
         # Ordering is not guaranteed on the return value from `_get_spam_content`
         # Split the strings back into individual tokens and sort for more reliable comparison
-        # TODO(ENG-XYZ): Refactor `_get_spam_content` uniersally to return the list of individual field
+        # TODO(ENG-XYZ): Refactor `_get_spam_content` universally to return the list of individual field
         # contents instead of the concatenated list in order to enable easier, more accurate comparison
         returned_content_elements = sorted(returned_content_string.split(' '))
         expected_content_elements = sorted(expected_content_string.split(' '))
diff --git a/osf_tests/external/gravy_valet/gv_fakes.py b/osf_tests/external/gravy_valet/gv_fakes.py
index f7ebf08747b..cdc2ab09a7a 100644
--- a/osf_tests/external/gravy_valet/gv_fakes.py
+++ b/osf_tests/external/gravy_valet/gv_fakes.py
@@ -339,7 +339,7 @@ def validate_headers(self, value: bool):
         self._validate_headers = value
 
     def _clear_mappings(self, include_providers: bool = True):
-        """Reset all configured users/resources/acounts/addons and, optionally, providers."""
+        """Reset all configured users/resources/accounts/addons and, optionally, providers."""
         if include_providers:
             # Mapping from _FakeAddonProvider name to _FakeAddonProvider
             self._known_providers = {}
diff --git a/osf_tests/external/oopspam/test_oopspam.py b/osf_tests/external/oopspam/test_oopspam.py
index 96656ecc6da..b4300875a76 100644
--- a/osf_tests/external/oopspam/test_oopspam.py
+++ b/osf_tests/external/oopspam/test_oopspam.py
@@ -18,11 +18,11 @@ class TestUserSpamOOPSpam:
     def user(self, mock_spam_head_request):
         test_user = AuthUserFactory()
         test_user.schools = [
-            {'insitution': fake.company(), 'department': 'engineering', 'degree': fake.catch_phrase()}
+            {'institution': fake.company(), 'department': 'engineering', 'degree': fake.catch_phrase()}
             for _ in range(2)
         ]
         test_user.jobs = [
-            {'insitution': fake.company(), 'department': 'QA', 'title': fake.catch_phrase()}
+            {'institution': fake.company(), 'department': 'QA', 'title': fake.catch_phrase()}
             for _ in range(2)
         ]
         test_user.social['profileWebsites'] = ['osf.io', 'cos.io']
diff --git a/osf_tests/factories.py b/osf_tests/factories.py
index 4d60f1f19d3..1c661502c1d 100644
--- a/osf_tests/factories.py
+++ b/osf_tests/factories.py
@@ -421,7 +421,7 @@ def _create(cls, target_class, project=None, is_public=False,
         if not draft_registration:
             draft_registration = DraftRegistrationFactory(
                 branched_from=project,
-                initator=user,
+                initiator=user,
                 registration_schema=schema,
                 provider=provider,
             )
@@ -727,7 +727,7 @@ def _create(cls, target_class, *args, **kwargs):
         update_task_patcher = mock.patch('website.preprints.tasks.on_preprint_updated.si')
         update_task_patcher.start()
 
-        # Step 1: create prerpint, guid and versioned guid
+        # Step 1: create preprint, guid and versioned guid
         instance = cls._build(target_class, *args, **kwargs)
         instance.save(guid_ready=False)
         # If use_guid is passed, use that guid instead of creating a new one
diff --git a/osf_tests/management_commands/test_approve_pending_schema_responses.py b/osf_tests/management_commands/test_approve_pending_schema_responses.py
index cc50f6e13d0..a222987bafa 100644
--- a/osf_tests/management_commands/test_approve_pending_schema_responses.py
+++ b/osf_tests/management_commands/test_approve_pending_schema_responses.py
@@ -50,7 +50,7 @@ def test_response(self):
     def test_auto_approval(self, control_response, is_moderated, expected_state):
         with mock.patch(
             'osf.models.schema_response.SchemaResponse.is_moderated',
-            new_callaoble=mock.PropertyMock
+            new_callable=mock.PropertyMock
         ) as mock_is_moderated:
             mock_is_moderated.return_value = is_moderated
             count = approve_pending_schema_responses()
diff --git a/osf_tests/management_commands/test_migration_registration_responses.py b/osf_tests/management_commands/test_migration_registration_responses.py
index 880590717d1..23a9bd99ccd 100644
--- a/osf_tests/management_commands/test_migration_registration_responses.py
+++ b/osf_tests/management_commands/test_migration_registration_responses.py
@@ -67,7 +67,7 @@
     'q14': '',
     'q17': 'this is my explanation of randomization',
     'q10': 'this is my stopping rule',
-    'q11.question': 'these are my maniuplated variables',
+    'q11.question': 'these are my manipulated variables',
     'q16.uploader': [],
     'q19.question': 'ANOVA',
     'q13.uploader': [],
@@ -253,7 +253,7 @@
         'value': {
             'question': {
                 'comments': [],
-                'value': 'these are my maniuplated variables',
+                'value': 'these are my manipulated variables',
                 'extra': []
             },
             'uploader': {
@@ -546,7 +546,7 @@
         'value': {
             'question': {
                 'comments': [],
-                'value': 'these are my maniuplated variables',
+                'value': 'these are my manipulated variables',
                 'extra': []
             },
             'uploader': {
@@ -681,7 +681,7 @@
                 'value': {
                     'question4b': {
                         'comments': [],
-                        'value': 'these are the preselection rults',
+                        'value': 'these are the preselection rules',
                         'extra': []
                     },
                     'question7b': {
@@ -743,7 +743,7 @@
                     },
                     'question10c': {
                         'comments': [],
-                        'value': 'assumptions of analysses',
+                        'value': 'assumptions of analyses',
                         'extra': []
                     }
                 },
@@ -791,7 +791,7 @@
                     },
                     'question2c': {
                         'comments': [],
-                        'value': 'this is the statistical technicque',
+                        'value': 'this is the statistical technique',
                         'extra': []
                     },
                     'question3c': {
@@ -1176,7 +1176,7 @@
                 'value': {
                     'question4b': {
                         'comments': [],
-                        'value': 'these are the preselection rults',
+                        'value': 'these are the preselection rules',
                         'extra': []
                     },
                     'question7b': {
@@ -1234,7 +1234,7 @@
                     },
                     'question10c': {
                         'comments': [],
-                        'value': 'assumptions of analysses',
+                        'value': 'assumptions of analyses',
                         'extra': []
                     }
                 },
@@ -1276,7 +1276,7 @@
                     },
                     'question2c': {
                         'comments': [],
-                        'value': 'this is the statistical technicque',
+                        'value': 'this is the statistical technique',
                         'extra': []
                     },
                     'question3c': {
@@ -1506,11 +1506,11 @@
     'description-methods.design.question3b': 'These variables are acting as covariates.',
     'confirmatory-analyses-further.further.question2c': 'i used a common statistical technique',
     'description-methods.exclusion-criteria.question8b': 'these are failing check-tests',
-    'description-methods.planned-sample.question4b': 'these are the preselection rults',
+    'description-methods.planned-sample.question4b': 'these are the preselection rules',
     'confirmatory-analyses-second.second.question3c': 'it was the covariate',
     'dataCollectionDates': '2020 - 2030',
     'recommended-analysis.specify.question6c': 'I used a method of correction for multiple tests',
-    'confirmatory-analyses-first.first.question2c': 'this is the statistical technicque',
+    'confirmatory-analyses-first.first.question2c': 'this is the statistical technique',
     'description-methods.procedure.question10b': 'describe all manipulations',
     'recommended-analysis.specify.question11c': [],
     'recommended-methods.procedure.question9b': 'set fail-safe levels of exclusions',
@@ -1562,7 +1562,7 @@
     'confirmatory-analyses-first.first.question3c': 'this is each variable role',
     'description-hypothesis.question3a': 'predictions for successful checks',
     'confirmatory-analyses-further.further.question5c': 'also Bayesian',
-    'recommended-analysis.specify.question10c': 'assumptions of analysses',
+    'recommended-analysis.specify.question10c': 'assumptions of analyses',
     'recommended-methods.procedure.question9b-file': [],
     'description-hypothesis.question1a': 'These are the essential elements',
     'description-methods.planned-sample.question7b': 'here is my data collection termination rule',
@@ -1751,7 +1751,7 @@ def test_migrate_draft_registrations(self, app, draft_osf_standard, draft_prereg
         assert responses['q14'] == ''
         assert responses['q17'] == 'this is my explanation of randomization'
         assert responses['q10'] == 'this is my stopping rule'
-        assert responses['q11.question'] == 'these are my maniuplated variables'
+        assert responses['q11.question'] == 'these are my manipulated variables'
         assert responses['q16.uploader'] == []
         assert responses['q19.question'] == 'ANOVA'
         assert responses['q13.uploader'] == []
@@ -1780,10 +1780,10 @@ def test_migrate_draft_registrations(self, app, draft_osf_standard, draft_prereg
         assert responses['description-methods.design.question3b'] == 'These variables are acting as covariates.'
         assert responses['confirmatory-analyses-second.second.question1c'] == 'how 2nd prediction calculated'
         assert responses['description-methods.exclusion-criteria.question8b'] == 'these are failing check-tests'
-        assert responses['description-methods.planned-sample.question4b'] == 'these are the preselection rults'
+        assert responses['description-methods.planned-sample.question4b'] == 'these are the preselection rules'
         assert responses['confirmatory-analyses-second.second.question3c'] == 'it was the covariate'
         assert responses['recommended-analysis.specify.question6c'] == 'I used a method of correction for multiple tests'
-        assert responses['confirmatory-analyses-first.first.question2c'] == 'this is the statistical technicque'
+        assert responses['confirmatory-analyses-first.first.question2c'] == 'this is the statistical technique'
         assert responses['description-methods.procedure.question10b'] == 'describe all manipulations'
         assert responses['recommended-analysis.specify.question11c'] == []
         assert responses['recommended-methods.procedure.question9b'] == 'set fail-safe levels of exclusions'
@@ -1838,7 +1838,7 @@ def test_migrate_draft_registrations(self, app, draft_osf_standard, draft_prereg
         assert responses['description-hypothesis.question3a'] == 'predictions for successful checks'
         assert responses['confirmatory-analyses-further.further.question2c'] == 'i used a common statistical technique'
         assert responses['confirmatory-analyses-further.further.question5c'] == 'also Bayesian'
-        assert responses['recommended-analysis.specify.question10c'] == 'assumptions of analysses'
+        assert responses['recommended-analysis.specify.question10c'] == 'assumptions of analyses'
         assert responses['recommended-methods.procedure.question9b-file'] == []
         assert responses['description-hypothesis.question1a'] == 'These are the essential elements'
         assert responses['description-methods.planned-sample.question7b'] == 'here is my data collection termination rule'
@@ -1984,7 +1984,7 @@ def test_migrate_registrations(self, app, reg_osf_standard, reg_prereg, reg_veer
         assert responses['q14'] == ''
         assert responses['q17'] == 'this is my explanation of randomization'
         assert responses['q10'] == 'this is my stopping rule'
-        assert responses['q11.question'] == 'these are my maniuplated variables'
+        assert responses['q11.question'] == 'these are my manipulated variables'
         assert responses['q16.uploader'] == []
         assert responses['q19.question'] == 'ANOVA'
         assert responses['q13.uploader'] == []
@@ -2013,10 +2013,10 @@ def test_migrate_registrations(self, app, reg_osf_standard, reg_prereg, reg_veer
         assert responses['description-methods.design.question3b'] == 'These variables are acting as covariates.'
         assert responses['confirmatory-analyses-second.second.question1c'] == 'how 2nd prediction calculated'
         assert responses['description-methods.exclusion-criteria.question8b'] == 'these are failing check-tests'
-        assert responses['description-methods.planned-sample.question4b'] == 'these are the preselection rults'
+        assert responses['description-methods.planned-sample.question4b'] == 'these are the preselection rules'
         assert responses['confirmatory-analyses-second.second.question3c'] == 'it was the covariate'
         assert responses['recommended-analysis.specify.question6c'] == 'I used a method of correction for multiple tests'
-        assert responses['confirmatory-analyses-first.first.question2c'] == 'this is the statistical technicque'
+        assert responses['confirmatory-analyses-first.first.question2c'] == 'this is the statistical technique'
         assert responses['description-methods.procedure.question10b'] == 'describe all manipulations'
         assert responses['recommended-analysis.specify.question11c'] == []
         assert responses['recommended-methods.procedure.question9b'] == 'set fail-safe levels of exclusions'
@@ -2071,7 +2071,7 @@ def test_migrate_registrations(self, app, reg_osf_standard, reg_prereg, reg_veer
         assert responses['description-hypothesis.question3a'] == 'predictions for successful checks'
         assert responses['confirmatory-analyses-further.further.question2c'] == 'i used a common statistical technique'
         assert responses['confirmatory-analyses-further.further.question5c'] == 'also Bayesian'
-        assert responses['recommended-analysis.specify.question10c'] == 'assumptions of analysses'
+        assert responses['recommended-analysis.specify.question10c'] == 'assumptions of analyses'
         assert responses['recommended-methods.procedure.question9b-file'] == []
         assert responses['description-hypothesis.question1a'] == 'These are the essential elements'
         assert responses['description-methods.planned-sample.question7b'] == 'here is my data collection termination rule'
diff --git a/osf_tests/management_commands/test_populate_initial_schema_responses.py b/osf_tests/management_commands/test_populate_initial_schema_responses.py
index 18949c09b33..799d977ba21 100644
--- a/osf_tests/management_commands/test_populate_initial_schema_responses.py
+++ b/osf_tests/management_commands/test_populate_initial_schema_responses.py
@@ -95,7 +95,7 @@ def test_populate_responses_is_atomic_per_registration(self, test_registration):
         assert not invalid_registration.schema_responses.exists()
 
     def test_dry_run(self, test_registration):
-        # donfirm that the delete works even if the schema_response isn't IN_PROGRESS
+        # confirm that the delete works even if the schema_response isn't IN_PROGRESS
         test_registration.moderation_state = RegStates.ACCEPTED.db_name
         test_registration.save()
         with pytest.raises(RuntimeError):
diff --git a/osf_tests/management_commands/test_reindex_es6.py b/osf_tests/management_commands/test_reindex_es6.py
index 1031ba1f782..5e01be656a8 100644
--- a/osf_tests/management_commands/test_reindex_es6.py
+++ b/osf_tests/management_commands/test_reindex_es6.py
@@ -52,7 +52,7 @@ def test_reindexing(self, app, url, preprint, user, admin, es6_client):
             preprint,
             user,
             version=1,
-            path='/MalcolmJenkinsKnockedBrandinCooksOutColdInTheSuperbowl',
+            path='/MalcolmJenkinsKnockedBrandinCooksOutColdInTheSuperBowl',
             random_new_field='Hi!'  # Here's our unmapped field! It's a text field by default.
         )
         preprint_download.save()
diff --git a/osf_tests/metadata/test_basket.py b/osf_tests/metadata/test_basket.py
index c34ded3e2c5..2154af9e4e6 100644
--- a/osf_tests/metadata/test_basket.py
+++ b/osf_tests/metadata/test_basket.py
@@ -67,7 +67,7 @@ def test_goodbasket():
     mock_gatherers[BLARG.hork].assert_called_once()
 
     # __getitem__
-    assert set(basket[BLARG.somethin_else]) == set()
+    assert set(basket[BLARG.something_else]) == set()
     # path:
     assert set(basket[BLARG.bork / BLARG.lork]) == {BLARG.borklorked}
     # explicit subject:
diff --git a/osf_tests/metadata/test_rdfutils.py b/osf_tests/metadata/test_rdfutils.py
index 6868595c591..b445a6e47a7 100644
--- a/osf_tests/metadata/test_rdfutils.py
+++ b/osf_tests/metadata/test_rdfutils.py
@@ -6,8 +6,8 @@
 
 
 def test_contextualized_graph():
-    shouldbe_graph = rdfutils.contextualized_graph()
-    assert isinstance(shouldbe_graph, rdflib.Graph)
+    should_be_graph = rdfutils.contextualized_graph()
+    assert isinstance(should_be_graph, rdflib.Graph)
 
     url_prefix_tests = {
         'https://osf.io/vocab/2022/blarg': ('osf', rdflib.URIRef(rdfutils.OSF), 'blarg'),
@@ -16,8 +16,8 @@ def test_contextualized_graph():
         'http://www.w3.org/2002/07/owl#blarg': ('owl', rdflib.URIRef(rdfutils.OWL), 'blarg'),
     }
     for url, prefixed in url_prefix_tests.items():
-        shouldbe_prefixed = shouldbe_graph.compute_qname(rdflib.URIRef(url), generate=False)
-        assert prefixed == shouldbe_prefixed
+        should_be_prefixed = should_be_graph.compute_qname(rdflib.URIRef(url), generate=False)
+        assert prefixed == should_be_prefixed
 
     # should leave these whole:
     unprefixed_url_tests = {
@@ -26,7 +26,7 @@ def test_contextualized_graph():
     }
     for unprefixed_url in unprefixed_url_tests:
         with pytest.raises(KeyError):
-            shouldbe_graph.compute_qname(rdflib.URIRef(unprefixed_url), generate=False)
+            should_be_graph.compute_qname(rdflib.URIRef(unprefixed_url), generate=False)
 
 def test_checksum_iri():
     checksum_tests = {
@@ -107,6 +107,6 @@ def test_primitivify_rdf():
         ({(9, (8, rdflib.BNode())), 7}),
         {'di': {rdflib.BNode(): 'hi'}},
     ]
-    for errory_input in should_raise_error:
+    for error_input in should_raise_error:
         with pytest.raises(ValueError):
-            rdfutils.primitivify_rdf(errory_input)
+            rdfutils.primitivify_rdf(error_input)
diff --git a/osf_tests/test_archiver.py b/osf_tests/test_archiver.py
index 65ebc719789..f7114bd32f3 100644
--- a/osf_tests/test_archiver.py
+++ b/osf_tests/test_archiver.py
@@ -403,7 +403,7 @@ def _test__get_file_tree(self, addon_short_name):
                     method=responses.GET,
                     url=url,
                     json=self.get_resp(url),
-                    content_type='applcation/json'
+                    content_type='application/json'
                 )
             )
         addon = self.src.get_or_add_addon(addon_short_name, auth=self.auth)
@@ -1008,7 +1008,7 @@ def test_archive_tree_finished_false_for_partial_archive(self):
         assert not reg.archive_job.archive_tree_finished()
 
     @mock.patch('website.archiver.tasks.archive_success.delay')
-    def test_archive_callback_on_tree_sends_only_one_email(self, mock_arhive_success):
+    def test_archive_callback_on_tree_sends_only_one_email(self, mock_archive_success):
         proj = factories.NodeFactory()
         child = factories.NodeFactory(parent=proj)
         factories.NodeFactory(parent=child)
diff --git a/osf_tests/test_comment.py b/osf_tests/test_comment.py
index 7f247d403d5..fc822b5d5d8 100644
--- a/osf_tests/test_comment.py
+++ b/osf_tests/test_comment.py
@@ -28,7 +28,7 @@
     AuthUserFactory,
 )
 
-# All tests will require a databse
+# All tests will require a database
 pytestmark = pytest.mark.django_db
 
 
diff --git a/osf_tests/test_draft_registration.py b/osf_tests/test_draft_registration.py
index c5b38632230..f37cd9bb219 100644
--- a/osf_tests/test_draft_registration.py
+++ b/osf_tests/test_draft_registration.py
@@ -377,7 +377,7 @@ def test_cant_add_same_contributor_twice(self, draft_registration):
         draft_registration.save()
         assert len(draft_registration.contributors) == 2
 
-    def test_remove_unregistered_conributor_removes_unclaimed_record(self, draft_registration, auth):
+    def test_remove_unregistered_contributor_removes_unclaimed_record(self, draft_registration, auth):
         new_user = draft_registration.add_unregistered_contributor(fullname='David Davidson',
             email='david@davidson.com', auth=auth)
         draft_registration.save()
@@ -570,7 +570,7 @@ def test_remove_admin_permission(self, draft_registration, auth):
             )
         assert str(exc_info.value) == f"{admin_user.fullname} is the only admin."
 
-        # user should be able to remove their own admin permission if there're 2+ admin contributors
+        # user should be able to remove their own admin permission if there are 2+ admin contributors
         new_contrib = factories.AuthUserFactory()
         draft_registration.add_contributor(new_contrib, permissions=ADMIN, auth=auth)
         assert draft_registration.has_permission(new_contrib, ADMIN) is True
diff --git a/osf_tests/test_elastic_search.py b/osf_tests/test_elastic_search.py
index 396e0d6b2aa..ef427665966 100644
--- a/osf_tests/test_elastic_search.py
+++ b/osf_tests/test_elastic_search.py
@@ -670,7 +670,7 @@ def test_node_license_added_to_search(self):
 
     @unittest.skip('Elasticsearch latency seems to be causing theses tests to fail randomly.')
     @retry_assertion(retries=10)
-    def test_node_license_propogates_to_children(self):
+    def test_node_license_propagates_to_children(self):
         docs = query(self.query)['results']
         child = [d for d in docs if d['title'] == self.public_child.title][0]
         assert 'license' in child
@@ -1069,7 +1069,7 @@ def test_search_fullname_special_character(self):
         contribs = search.search_contributor(self.name4)
         assert len(contribs['users']) == 0
 
-    def test_search_firstname_special_charcter(self):
+    def test_search_firstname_special_character(self):
         # Searching for a first name with a special character yields
         # exactly one result.
         contribs = search.search_contributor(self.name3.split(' ')[0])
@@ -1080,7 +1080,7 @@ def test_search_firstname_special_charcter(self):
 
     def test_search_partial_special_character(self):
         # Searching for a partial name with a special character yields
-        # exctly one result.
+        # exactly one result.
         contribs = search.search_contributor(self.name3.split(' ')[0][:-1])
         assert len(contribs['users']) == 1
 
@@ -1219,7 +1219,7 @@ def setUp(self):
             self.user_five
         ]
 
-    @unittest.skip('Cannot guarentee always passes')
+    @unittest.skip('Cannot guarantee always passes')
     def test_current_job_first_in_results(self):
         results = query_user('Star Fleet')['results']
         result_names = [r['names']['fullname'] for r in results]
diff --git a/osf_tests/test_guid.py b/osf_tests/test_guid.py
index 5a77042e460..fb825261906 100644
--- a/osf_tests/test_guid.py
+++ b/osf_tests/test_guid.py
@@ -212,7 +212,7 @@ def test_resolve_guid_no_auth_redirect_to_cas_includes_public_with_url_segments(
 
     def test_resolve_guid_private_request_access_or_redirect_to_cas(self):
         """
-        Authenticated users are sent to the request access page when it is set to true on the node, otherwise they get a
+        Authenticated users are sent to the request access page when it is set to true on the node; otherwise, they get a
         legacy Forbidden page.
         """
         non_contrib = AuthUserFactory()
diff --git a/osf_tests/test_gv_utils.py b/osf_tests/test_gv_utils.py
index acee15c8df6..b44ca301a42 100644
--- a/osf_tests/test_gv_utils.py
+++ b/osf_tests/test_gv_utils.py
@@ -473,7 +473,7 @@ def test_get_resource_addons(self, resource, contributor, fake_gv):
         addon_one = fake_gv.configure_fake_addon(resource, account_one)
         addon_two = fake_gv.configure_fake_addon(resource, account_two)
         addon_three = fake_gv.configure_fake_addon(resource, account_three)
-        # Unrelated Addon, will KeyError below if retured in request results
+        # Unrelated Addon, will KeyError below if returned in request results
         fake_gv.configure_fake_addon(factories.ProjectFactory(creator=contributor), account_one)
 
         expected_addons = {addon.pk: addon for addon in [addon_one, addon_two, addon_three]}
diff --git a/osf_tests/test_handle_duplicate_files.py b/osf_tests/test_handle_duplicate_files.py
index d95df3db11d..e13d0a6b8b5 100644
--- a/osf_tests/test_handle_duplicate_files.py
+++ b/osf_tests/test_handle_duplicate_files.py
@@ -48,7 +48,7 @@ def file_dupe_one(project, user):
 def file_dupe_two(project, user, file_dupe_one):
     # Creating a test file and then renaming it to have the
     # same name as the first file to artificially create
-    # the duplicate file scencario
+    # the duplicate file scenario
     file = create_test_file(project, user, 'temp_name')
     file.name = file_dupe_one.name
     file.save()
diff --git a/osf_tests/test_management_commands.py b/osf_tests/test_management_commands.py
index 26e34601648..80deee182d6 100644
--- a/osf_tests/test_management_commands.py
+++ b/osf_tests/test_management_commands.py
@@ -1,6 +1,5 @@
 from unittest import mock
 import pytest
-import time
 
 from collections import OrderedDict
 
@@ -9,13 +8,10 @@
 from addons.osfstorage import settings as osfstorage_settings
 from api_tests.utils import create_test_file
 from framework.auth import Auth
-from osf.management.commands.update_institution_project_counts import update_institution_project_counts
 from osf.management.commands.project_to_draft_registration_contributor_sync import retrieve_draft_registrations_to_sync, project_to_draft_registration_contributor_sync
 from osf.models import RegistrationSchema
-from osf.metrics import InstitutionProjectCounts, UserInstitutionProjectCounts
 from osf_tests.factories import (
     AuthUserFactory,
-    InstitutionFactory,
     PreprintFactory,
     ProjectFactory,
     RegistrationFactory,
@@ -265,109 +261,6 @@ def test_data_storage_usage_command(self):
                 assert (key, expected_summary_data[key]) == (key, actual_summary_data[key])
 
 
-@pytest.mark.es_metrics
-@pytest.mark.django_db
-class TestInstitutionMetricsUpdate:
-
-    @pytest.fixture()
-    def institution(self):
-        # Private: 14, Public: 4
-        return InstitutionFactory()
-
-    @pytest.fixture()
-    def user1(self, institution):
-        # Private: 4, Public: 4 (+1 from user2 fixture)
-        user = AuthUserFactory()
-        user.add_or_update_affiliated_institution(institution)
-
-        for i in range(5):
-            project = ProjectFactory(creator=user, is_public=False)
-            project.affiliated_institutions.add(institution)
-            project.save()
-
-        project.delete()
-
-        for i in range(3):
-            project = ProjectFactory(creator=user, is_public=True)
-            project.affiliated_institutions.add(institution)
-            project.save()
-
-        ProjectFactory(creator=user, is_public=True)
-        ProjectFactory(creator=user, is_public=False)
-
-        return user
-
-    @pytest.fixture()
-    def user2(self, institution, user1):
-        # Private: 10, Public: 1
-        user = AuthUserFactory()
-        user.add_or_update_affiliated_institution(institution)
-
-        for i in range(10):
-            project = ProjectFactory(creator=user, is_public=False)
-            project.affiliated_institutions.add(institution)
-            project.save()
-        for i in range(1):
-            project = ProjectFactory(creator=user, is_public=True)
-            project.add_contributor(user1)
-            project.affiliated_institutions.add(institution)
-            project.save()
-
-        return user
-
-    @pytest.fixture()
-    def user3(self, institution):
-        # Private: 0, Public: 0
-        user = AuthUserFactory()
-        user.add_or_update_affiliated_institution(institution)
-
-        return user
-
-    @pytest.fixture()
-    def user4(self):
-        # Projects should not be included in results
-        user = AuthUserFactory()
-
-        for i in range(3):
-            project = ProjectFactory(creator=user, is_public=False)
-            project.save()
-        for i in range(6):
-            project = ProjectFactory(creator=user, is_public=True)
-            project.save()
-
-        return user
-
-    def test_update_institution_counts(self, app, institution, user1, user2, user3, user4):
-        update_institution_project_counts()
-
-        time.sleep(2)
-
-        user_search = UserInstitutionProjectCounts.get_current_user_metrics(institution)
-        user_results = user_search.execute()
-        sorted_results = sorted(user_results, key=lambda x: x['private_project_count'])
-
-        user3_record = sorted_results[0]
-        user1_record = sorted_results[1]
-        user2_record = sorted_results[2]
-
-        assert user1_record['user_id'] == user1._id
-        assert user1_record['public_project_count'] == 4
-        assert user1_record['private_project_count'] == 4
-
-        assert user2_record['user_id'] == user2._id
-        assert user2_record['public_project_count'] == 1
-        assert user2_record['private_project_count'] == 10
-
-        assert user3_record['user_id'] == user3._id
-        assert user3_record['public_project_count'] == 0
-        assert user3_record['private_project_count'] == 0
-
-        institution_results = InstitutionProjectCounts.get_latest_institution_project_document(institution)
-
-        assert institution_results['public_project_count'] == 4
-        assert institution_results['private_project_count'] == 14
-
-
 @pytest.mark.django_db
 class TestProjectDraftRegContributorSync:
     @pytest.fixture()
diff --git a/osf_tests/test_merging_users.py b/osf_tests/test_merging_users.py
index 0bb124c4f13..dbf2b73eb05 100644
--- a/osf_tests/test_merging_users.py
+++ b/osf_tests/test_merging_users.py
@@ -288,7 +288,7 @@ def test_merge_unregistered(self):
 
     @mock.patch('website.project.views.contributor.mails.send_mail')
     def test_merge_doesnt_send_signal(self, mock_notify):
-        #Explictly reconnect signal as it is disconnected by default for test
+        #Explicitly reconnect signal as it is disconnected by default for test
         contributor_added.connect(notify_added_contributor)
         other_user = UserFactory()
         with override_flag(ENABLE_GV, active=True):
diff --git a/osf_tests/test_node.py b/osf_tests/test_node.py
index ee89ebb2d8a..70fa9f92e23 100644
--- a/osf_tests/test_node.py
+++ b/osf_tests/test_node.py
@@ -422,7 +422,7 @@ def test_template_has_correct_affiliations(self, user, auth, project_with_affili
         assert set(project_affiliations) != set(user_affiliations)
         assert set(template_affiliations) == set(user_affiliations)
 
-    def test_teplate_project_child_has_correct_parent(self, template):
+    def test_template_project_child_has_correct_parent(self, template):
         template_child = NodeFactory(parent=template)
         assert template_child.parent_node._id == template._id
 
@@ -942,7 +942,7 @@ def test_cant_add_same_contributor_twice(self, node):
         node.save()
         assert len(node.contributors) == 2
 
-    def test_remove_unregistered_conributor_removes_unclaimed_record(self, node, auth):
+    def test_remove_unregistered_contributor_removes_unclaimed_record(self, node, auth):
         new_user = node.add_unregistered_contributor(fullname='David Davidson',
             email='david@davidson.com', auth=auth)
         node.save()
diff --git a/osf_tests/test_notable_domains.py b/osf_tests/test_notable_domains.py
index 52eff0464b3..317ae2dc7fc 100644
--- a/osf_tests/test_notable_domains.py
+++ b/osf_tests/test_notable_domains.py
@@ -61,14 +61,14 @@ def test_extract_domains__no_domains(self, mock_spam_head_request):
         domains = set(spam_tasks._extract_domains(sample_text))
         assert not domains
 
-    def test_extract_domains__unverfied_if_does_not_resolve(self, mock_spam_head_request):
+    def test_extract_domains__unverified_if_does_not_resolve(self, mock_spam_head_request):
         mock_spam_head_request.side_effect = spam_tasks.requests.exceptions.ConnectionError
         sample_text = 'This.will.not.connect'
 
         domains = set(spam_tasks._extract_domains(sample_text))
         assert domains == {('This.will.not.connect', NotableDomain.Note.UNVERIFIED)}
 
-    def test_actract_domains__returned_on_error(self, mock_spam_head_request):
+    def test_extract_domains__returned_on_error(self, mock_spam_head_request):
         sample_text = 'This.will.timeout'
         mock_spam_head_request.side_effect = spam_tasks.requests.exceptions.Timeout
         domains = set(spam_tasks._extract_domains(sample_text))
@@ -422,7 +422,7 @@ def test_from_spam_to_ignored_two_spam_domains(self, factory, spam_notable_domai
         assert set(obj_two.spam_data['domains']) == {self.spam_domain_two.netloc}
 
     @pytest.mark.parametrize('factory', [NodeFactory, CommentFactory, PreprintFactory, RegistrationFactory, UserFactory])
-    def test_from_spam_to_ignored_makred_by_external(self, factory, spam_notable_domain_one, spam_notable_domain_two, unknown_notable_domain, ignored_notable_domain):
+    def test_from_spam_to_ignored_marked_by_external(self, factory, spam_notable_domain_one, spam_notable_domain_two, unknown_notable_domain, ignored_notable_domain):
         obj_three = factory()
         obj_three.spam_data['who_flagged'] = 'some external spam checker'
         obj_three.save()
diff --git a/osf_tests/test_outcomes.py b/osf_tests/test_outcomes.py
index fbba03ddfbf..abc11c659b0 100644
--- a/osf_tests/test_outcomes.py
+++ b/osf_tests/test_outcomes.py
@@ -270,7 +270,7 @@ def test_update__enforces_uniqueness_if_finalized(self, outcome, project_doi):
         with pytest.raises(IntegrityError):  # Raise when set to a duplicate artifact_type
             test_artifact.update(new_artifact_type=ArtifactTypes.DATA)
 
-    def test_update__enforces_uniquenss_if_finalized__nonfinal_duplicate_okay(self, outcome, project_doi):
+    def test_update__enforces_uniqueness_if_finalized__nonfinal_duplicate_okay(self, outcome, project_doi):
         nonfinal_artifact = outcome.artifact_metadata.create(
             identifier=project_doi, artifact_type=ArtifactTypes.DATA, finalized=False
         )
@@ -282,7 +282,7 @@ def test_update__enforces_uniquenss_if_finalized__nonfinal_duplicate_okay(self,
         assert test_artifact.artifact_type == nonfinal_artifact.artifact_type
         assert test_artifact.identifier == nonfinal_artifact.identifier
 
-    def test_update__enforces_uniquenss_if_finalized__deleted_duplicate_okay(self, outcome, project_doi):
+    def test_update__enforces_uniqueness_if_finalized__deleted_duplicate_okay(self, outcome, project_doi):
         deleted_artifact = outcome.artifact_metadata.create(
             identifier=project_doi, artifact_type=ArtifactTypes.DATA, finalized=True, deleted=timezone.now()
         )
@@ -338,7 +338,7 @@ def test_finalize__enforces_uniqueness(self, outcome, project_doi):
         with pytest.raises(IntegrityError):
             test_artifact.finalize()
 
-    def test_finalize__enforces_uniquenss__deleted_entry_okay(self, outcome, project_doi):
+    def test_finalize__enforces_uniqueness__deleted_entry_okay(self, outcome, project_doi):
         outcome.artifact_metadata.create(
             identifier=project_doi, artifact_type=ArtifactTypes.DATA, finalized=True, deleted=timezone.now()
         )
diff --git a/osf_tests/test_registration_moderation_notifications.py b/osf_tests/test_registration_moderation_notifications.py
index 100c15e64e1..3be286ba5bf 100644
--- a/osf_tests/test_registration_moderation_notifications.py
+++ b/osf_tests/test_registration_moderation_notifications.py
@@ -146,7 +146,7 @@ def test_submit_notifications(self, registration, moderator, admin, contrib, pro
         """
         # Set up mock_send_mail as a pass-through to the original function.
         # This lets us assert on the call/args and also implicitly ensures
-        # that the email acutally renders as normal in send_mail.
+        # that the email actually renders as normal in send_mail.
         notify_submit(registration, admin)
 
         assert len(mock_send_grid.call_args_list) == 2
@@ -174,7 +174,7 @@ def test_accept_notifications(self, registration, moderator, admin, contrib, acc
 
         # Set up mock_email as a pass-through to the original function.
         # This lets us assert on the call count/args and also implicitly
-        # ensures that the email acutally renders correctly.
+        # ensures that the email actually renders correctly.
         store_emails = emails.store_emails
         with mock.patch.object(emails, 'store_emails', side_effect=store_emails) as mock_email:
             notify_accept_reject(registration, registration.creator, accept_action, RegistrationModerationStates)
@@ -244,7 +244,7 @@ def test_reject_notifications(self, registration, moderator, admin, contrib, acc
 
         # Set up mock_email as a pass-through to the original function.
         # This lets us assert on the call count/args and also implicitly
-        # ensures that the email acutally renders correctly
+        # ensures that the email actually renders correctly
         store_emails = emails.store_emails
         with mock.patch.object(emails, 'store_emails', side_effect=store_emails) as mock_email:
             notify_accept_reject(registration, registration.creator, accept_action, RegistrationModerationStates)
@@ -339,7 +339,7 @@ def test_withdrawal_registration_accepted_notifications(self, registration_with_
         """
         # Set up mock_send_mail as a pass-through to the original function.
         # This lets us assert on the call count/args and also implicitly
-        # ensures that the email acutally renders as normal in send_mail.
+        # ensures that the email actually renders as normal in send_mail.
         notify_withdraw_registration(registration_with_retraction, withdraw_action)
 
         assert len(mock_send_grid.call_args_list) == 2
@@ -362,7 +362,7 @@ def test_withdrawal_registration_rejected_notifications(self, registration, cont
         """
         # Set up mock_send_mail as a pass-through to the original function.
         # This lets us assert on the call count/args and also implicitly
-        # ensures that the email acutally renders as normal in send_mail.
+        # ensures that the email actually renders as normal in send_mail.
         notify_reject_withdraw_request(registration, withdraw_request_action)
 
         assert len(mock_send_grid.call_args_list) == 2
@@ -385,7 +385,7 @@ def test_withdrawal_registration_force_notifications(self, registration_with_ret
         """
         # Set up mock_send_mail as a pass-through to the original function.
         # This lets us assert on the call count/args and also implicitly
-        # ensures that the email acutally renders as normal in send_mail.
+        # ensures that the email actually renders as normal in send_mail.
         notify_withdraw_registration(registration_with_retraction, withdraw_action)
 
         assert len(mock_send_grid.call_args_list) == 2
@@ -423,7 +423,7 @@ def test_submissions_and_withdrawals_both_appear_in_moderator_digest(self, diges
         assert any('requested withdrawal' in entry['message'] for entry in updates)
 
     @pytest.mark.parametrize('digest_type', ['email_transactional', 'email_digest'])
-    def test_submsissions_and_withdrawals_do_not_appear_in_node_digest(self, digest_type, registration, admin, moderator, daily_moderator):
+    def test_submissions_and_withdrawals_do_not_appear_in_node_digest(self, digest_type, registration, admin, moderator, daily_moderator):
         notify_submit(registration, admin)
         notify_moderator_registration_requests_withdrawal(registration, admin)
 
@@ -433,7 +433,7 @@ def test_moderator_digest_emails_render(self, registration, admin, moderator, mo
         notify_moderator_registration_requests_withdrawal(registration, admin)
         # Set up mock_send_mail as a pass-through to the original function.
         # This lets us assert on the call count/args and also implicitly
-        # ensures that the email acutally renders as normal in send_mail.
+        # ensures that the email actually renders as normal in send_mail.
         tasks._send_reviews_moderator_emails('email_transactional')
 
         mock_send_grid.assert_called()
diff --git a/osf_tests/test_registrations.py b/osf_tests/test_registrations.py
index a93ffba6264..160188bab03 100644
--- a/osf_tests/test_registrations.py
+++ b/osf_tests/test_registrations.py
@@ -636,7 +636,7 @@ def test_expand_registration_responses_veer(self, draft_veer):
         assert registration_metadata == veer_condensed
 
 @pytest.mark.usefixtures('mock_gravy_valet_get_verified_links')
-class TestRegistationModerationStates:
+class TestRegistrationModerationStates:
 
     @pytest.fixture
     def embargo(self):
diff --git a/osf_tests/test_sanctions.py b/osf_tests/test_sanctions.py
index de4161ced4a..e33cf219d27 100644
--- a/osf_tests/test_sanctions.py
+++ b/osf_tests/test_sanctions.py
@@ -185,7 +185,7 @@ def test_registration_approval__doi_minted_on_approval(self):
         registration.registration_approval.accept()
         assert registration.get_identifier_value(category='doi')
 
-    def test_embargo__identifier_created_but_not_minted_on_aproval(self):
+    def test_embargo__identifier_created_but_not_minted_on_approval(self):
         registration = self.make_test_registration(embargoed=True, moderated=False)
         assert not registration.get_identifier(category='doi')
 
diff --git a/osf_tests/test_schema_responses.py b/osf_tests/test_schema_responses.py
index 40965c7cf31..1b764cfb1df 100644
--- a/osf_tests/test_schema_responses.py
+++ b/osf_tests/test_schema_responses.py
@@ -302,7 +302,7 @@ def test_all_responses_property(self, initial_response):
         for block in initial_response.response_blocks.all():
             assert initial_response.all_responses[block.schema_key] == block.response
 
-    def test_uodated_response_keys_property(self, initial_response, revised_response, schema):
+    def test_updated_response_keys_property(self, initial_response, revised_response, schema):
         # initial_response "updates" all keys
         all_keys = set(
             RegistrationSchemaBlock.objects.filter(
@@ -764,7 +764,7 @@ def test_reject_response_requires_user(self, initial_response, admin_user):
         with pytest.raises(PermissionsError):
             initial_response.reject()
 
-    def test_non_approver_cannnot_reject_response(
+    def test_non_approver_cannot_reject_response(
             self, initial_response, admin_user, alternate_user):
         initial_response.approvals_state_machine.set_state(ApprovalStates.UNAPPROVED)
         initial_response.save()
diff --git a/osf_tests/test_session.py b/osf_tests/test_session.py
index 7e57d18764c..e49ae686597 100644
--- a/osf_tests/test_session.py
+++ b/osf_tests/test_session.py
@@ -263,7 +263,7 @@ def test_clear_expired_sessions_remove_expired_sessions(self, auth_user, auth_us
         assert Session.objects.filter(session_key=session.session_key).count() == 0
 
 
-# In order to use AppTestCase to access `self.context.g`, we have to use unitest instead of pytest. There is an issue
+# In order to use AppTestCase to access `self.context.g`, we have to use unit tests instead of pytest. There is an issue
 # with pytest fixtures in unit tests. Unfortunately, the solution provided in the following link doesn't work :(
 #   https://pytest.org/en/latest/how-to/unittest.html
 @pytest.mark.django_db
diff --git a/osf_tests/test_user.py b/osf_tests/test_user.py
index 11b775f6897..41314641810 100644
--- a/osf_tests/test_user.py
+++ b/osf_tests/test_user.py
@@ -30,8 +30,6 @@
     NotableDomain,
     PreprintContributor,
     DraftRegistrationContributor,
-    DraftRegistration,
-    DraftNode,
     UserSessionMap,
 )
 from osf.models.institution_affiliation import get_user_by_institution_identity
@@ -2116,26 +2114,6 @@ def test_can_gdpr_delete_personal_nodes(self, user):
         user.gdpr_delete()
         assert user.nodes.exclude(is_deleted=True).count() == 0
 
-    def test_can_gdpr_delete_personal_registrations(self, user, registration_with_draft_node):
-        assert DraftRegistration.objects.all().count() == 1
-        assert DraftNode.objects.all().count() == 1
-
-        with pytest.raises(UserStateError) as exc_info:
-            user.gdpr_delete()
-
-        assert exc_info.value.args[0] == 'You cannot delete this user because they have one or more registrations.'
-        assert DraftRegistration.objects.all().count() == 1
-        assert DraftNode.objects.all().count() == 1
-
-        registration_with_draft_node.remove_node(Auth(user))
-        assert DraftRegistration.objects.all().count() == 1
-        assert DraftNode.objects.all().count() == 1
-        user.gdpr_delete()
-
-        # DraftNodes soft-deleted, DraftRegistions hard-deleted
-        assert user.nodes.exclude(is_deleted=True).count() == 0
-        assert DraftRegistration.objects.all().count() == 0
-
     def test_can_gdpr_delete_shared_nodes_with_multiple_admins(self, user, project_with_two_admins):
 
         user.gdpr_delete()
@@ -2144,7 +2122,7 @@ def test_can_gdpr_delete_shared_nodes_with_multiple_admins(self, user, project_w
     def test_can_gdpr_delete_shared_draft_registration_with_multiple_admins(self, user, registration):
         other_admin = AuthUserFactory()
         draft_registrations = user.draft_registrations.get()
-        draft_registrations.add_contributor(other_admin, permissions='admin')
+        draft_registrations.add_contributor(other_admin, auth=Auth(user), permissions='admin')
         assert draft_registrations.contributors.all().count() == 2
         registration.delete_registration_tree(save=True)
 
@@ -2152,20 +2130,53 @@ def test_can_gdpr_delete_shared_draft_registration_with_multiple_admins(self, us
         assert draft_registrations.contributors.get() == other_admin
         assert user.nodes.filter(deleted__isnull=True).count() == 0
 
-    def test_cant_gdpr_delete_registrations(self, user, registration):
+    def test_cant_gdpr_delete_multiple_contributors_registrations(self, user, registration):
+        registration.is_public = True
+        other_user = AuthUserFactory()
+        registration.add_contributor(other_user, auth=Auth(user), permissions='admin')
+        registration.save()
+
+        assert registration.contributors.count() == 2
 
         with pytest.raises(UserStateError) as exc_info:
             user.gdpr_delete()
 
         assert exc_info.value.args[0] == 'You cannot delete this user because they have one or more registrations.'
 
-    def test_cant_gdpr_delete_preprints(self, user, preprint):
+    def test_cant_gdpr_delete_multiple_contributors_preprints(self, user, preprint):
+        other_user = AuthUserFactory()
+        preprint.add_contributor(other_user, auth=Auth(user), permissions='admin')
+        preprint.save()
 
         with pytest.raises(UserStateError) as exc_info:
             user.gdpr_delete()
 
         assert exc_info.value.args[0] == 'You cannot delete this user because they have one or more preprints.'
 
+    def test_can_gdpr_delete_sole_contributor_registration(self, user):
+        registration = RegistrationFactory(creator=user)
+        registration.save()
+
+        assert registration.contributors.count() == 1
+        assert registration.contributors.first() == user
+
+        user.gdpr_delete()
+
+        assert user.fullname == 'Deleted user'
+        assert user.deleted is not None
+
+    def test_can_gdpr_delete_sole_contributor_preprint(self, user):
+        preprint = PreprintFactory(creator=user)
+        preprint.save()
+
+        assert preprint.contributors.count() == 1
+        assert preprint.contributors.first() == user
+
+        user.gdpr_delete()
+
+        assert user.fullname == 'Deleted user'
+        assert user.deleted is not None
+
     def test_cant_gdpr_delete_shared_node_if_only_admin(self, user, project_user_is_only_admin):
 
         with pytest.raises(UserStateError) as exc_info:
diff --git a/osf_tests/utils.py b/osf_tests/utils.py
index a8364a15478..de00c7e5adc 100644
--- a/osf_tests/utils.py
+++ b/osf_tests/utils.py
@@ -225,7 +225,7 @@ def _ensure_subscriptions(provider):
     '''Make sure a provider's subscriptions exist.
 
     Provider subscriptions are populated by an on_save signal when the provider is created.
-    This has led to observed race conditions and probabalistic test failures.
+    This has led to observed race conditions and probabilistic test failures.
     Avoid that.
     '''
     for subscription in provider.DEFAULT_SUBSCRIPTIONS:
diff --git a/package.json b/package.json
index e5dbef4eb8c..cf9eafda1a0 100644
--- a/package.json
+++ b/package.json
@@ -12,6 +12,10 @@
     "@centerforopenscience/markdown-it-toc": "~1.1.1",
     "@centerforopenscience/markdown-it-video": "1.0.0",
     "@centerforopenscience/osf-style": "1.9.0",
+    "@fortawesome/fontawesome-free": "^7.0.1",
+    "@fortawesome/fontawesome-svg-core": "^7.0.1",
+    "@fortawesome/free-brands-svg-icons": "^7.0.1",
+    "@fortawesome/react-fontawesome": "^3.0.2",
     "URIjs": "^1.14.1",
     "assets-webpack-plugin": "^2.3.0",
     "babel-core": "^6.0.0",
@@ -25,7 +29,6 @@
     "dropzone": "https://github.com/CenterForOpenScience/dropzone.git#aba21eb6b82cc823ac7a7a53d6e035791c082bae",
     "exports-loader": "0.6.3",
     "file-loader": "^0.11.2",
-    "font-awesome": "^4.4.0",
     "font-awesome-webpack": "0.0.5-beta.2",
     "gsap": "3.9.1",
     "highlight.js": "~9.18.2",
diff --git a/poetry.lock b/poetry.lock
index 28d99cf780e..dd79982f24f 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -1,4 +1,4 @@
-# This file is automatically @generated by Poetry 1.8.2 and should not be changed by hand.
+# This file is automatically @generated by Poetry 2.1.3 and should not be changed by hand.
 
 [[package]]
 name = "amqp"
@@ -6,6 +6,7 @@ version = "5.2.0"
 description = "Low-level AMQP client for Python (fork of amqplib)."
 optional = false
 python-versions = ">=3.6"
+groups = ["main"]
 files = [
     {file = "amqp-5.2.0-py3-none-any.whl", hash = "sha256:827cb12fb0baa892aad844fd95258143bce4027fdac4fccddbc43330fd281637"},
     {file = "amqp-5.2.0.tar.gz", hash = "sha256:a1ecff425ad063ad42a486c902807d1482311481c8ad95a72694b2975e75f7fd"},
@@ -20,6 +21,7 @@ version = "1.3.0"
 description = "Better dates & times for Python"
 optional = false
 python-versions = ">=3.8"
+groups = ["addons"]
 files = [
     {file = "arrow-1.3.0-py3-none-any.whl", hash = "sha256:c728b120ebc00eb84e01882a6f5e7927a53960aa990ce7dd2b10f39005a67f80"},
     {file = "arrow-1.3.0.tar.gz", hash = "sha256:d4540617648cb5f895730f1ad8c82a65f2dad0166f57b75f3ca54759c4d67a85"},
@@ -39,6 +41,7 @@ version = "3.7.2"
 description = "ASGI specs, helper code, and adapters"
 optional = false
 python-versions = ">=3.7"
+groups = ["main", "addons", "dev"]
 files = [
     {file = "asgiref-3.7.2-py3-none-any.whl", hash = "sha256:89b2ef2247e3b562a16eef663bc0e2e703ec6468e2fa8a5cd61cd449786d4f6e"},
     {file = "asgiref-3.7.2.tar.gz", hash = "sha256:9e0ce3aa93a819ba5b45120216b23878cf6e8525eb3848653452b4192b92afed"},
@@ -53,6 +56,7 @@ version = "2.4.1"
 description = "Annotate AST trees with source code positions"
 optional = false
 python-versions = "*"
+groups = ["dev"]
 files = [
     {file = "asttokens-2.4.1-py2.py3-none-any.whl", hash = "sha256:051ed49c3dcae8913ea7cd08e46a606dba30b79993209636c4875bc1d637bc24"},
     {file = "asttokens-2.4.1.tar.gz", hash = "sha256:b03869718ba9a6eb027e134bfdf69f38a236d681c83c160d510768af11254ba0"},
@@ -62,8 +66,8 @@ files = [
 six = ">=1.12.0"
 
 [package.extras]
-astroid = ["astroid (>=1,<2)", "astroid (>=2,<4)"]
-test = ["astroid (>=1,<2)", "astroid (>=2,<4)", "pytest"]
+astroid = ["astroid (>=1,<2) ; python_version < \"3\"", "astroid (>=2,<4) ; python_version >= \"3\""]
+test = ["astroid (>=1,<2) ; python_version < \"3\"", "astroid (>=2,<4) ; python_version >= \"3\"", "pytest"]
 
 [[package]]
 name = "attrs"
@@ -71,18 +75,19 @@ version = "24.2.0"
 description = "Classes Without Boilerplate"
 optional = false
 python-versions = ">=3.7"
+groups = ["main", "addons"]
 files = [
     {file = "attrs-24.2.0-py3-none-any.whl", hash = "sha256:81921eb96de3191c8258c199618104dd27ac608d9366f5e35d011eae1867ede2"},
     {file = "attrs-24.2.0.tar.gz", hash = "sha256:5cfb1b9148b5b086569baec03f20d7b6bf3bcacc9a42bebf87ffaaca362f6346"},
 ]
 
 [package.extras]
-benchmark = ["cloudpickle", "hypothesis", "mypy (>=1.11.1)", "pympler", "pytest (>=4.3.0)", "pytest-codspeed", "pytest-mypy-plugins", "pytest-xdist[psutil]"]
-cov = ["cloudpickle", "coverage[toml] (>=5.3)", "hypothesis", "mypy (>=1.11.1)", "pympler", "pytest (>=4.3.0)", "pytest-mypy-plugins", "pytest-xdist[psutil]"]
-dev = ["cloudpickle", "hypothesis", "mypy (>=1.11.1)", "pre-commit", "pympler", "pytest (>=4.3.0)", "pytest-mypy-plugins", "pytest-xdist[psutil]"]
+benchmark = ["cloudpickle ; platform_python_implementation == \"CPython\"", "hypothesis", "mypy (>=1.11.1) ; platform_python_implementation == \"CPython\" and python_version >= \"3.9\"", "pympler", "pytest (>=4.3.0)", "pytest-codspeed", "pytest-mypy-plugins ; platform_python_implementation == \"CPython\" and python_version >= \"3.9\" and python_version < \"3.13\"", "pytest-xdist[psutil]"]
+cov = ["cloudpickle ; platform_python_implementation == \"CPython\"", "coverage[toml] (>=5.3)", "hypothesis", "mypy (>=1.11.1) ; platform_python_implementation == \"CPython\" and python_version >= \"3.9\"", "pympler", "pytest (>=4.3.0)", "pytest-mypy-plugins ; platform_python_implementation == \"CPython\" and python_version >= \"3.9\" and python_version < \"3.13\"", "pytest-xdist[psutil]"]
+dev = ["cloudpickle ; platform_python_implementation == \"CPython\"", "hypothesis", "mypy (>=1.11.1) ; platform_python_implementation == \"CPython\" and python_version >= \"3.9\"", "pre-commit", "pympler", "pytest (>=4.3.0)", "pytest-mypy-plugins ; platform_python_implementation == \"CPython\" and python_version >= \"3.9\" and python_version < \"3.13\"", "pytest-xdist[psutil]"]
 docs = ["cogapp", "furo", "myst-parser", "sphinx", "sphinx-notfound-page", "sphinxcontrib-towncrier", "towncrier (<24.7)"]
-tests = ["cloudpickle", "hypothesis", "mypy (>=1.11.1)", "pympler", "pytest (>=4.3.0)", "pytest-mypy-plugins", "pytest-xdist[psutil]"]
-tests-mypy = ["mypy (>=1.11.1)", "pytest-mypy-plugins"]
+tests = ["cloudpickle ; platform_python_implementation == \"CPython\"", "hypothesis", "mypy (>=1.11.1) ; platform_python_implementation == \"CPython\" and python_version >= \"3.9\"", "pympler", "pytest (>=4.3.0)", "pytest-mypy-plugins ; platform_python_implementation == \"CPython\" and python_version >= \"3.9\" and python_version < \"3.13\"", "pytest-xdist[psutil]"]
+tests-mypy = ["mypy (>=1.11.1) ; platform_python_implementation == \"CPython\" and python_version >= \"3.9\"", "pytest-mypy-plugins ; platform_python_implementation == \"CPython\" and python_version >= \"3.9\" and python_version < \"3.13\""]
 
 [[package]]
 name = "autopep8"
@@ -90,6 +95,7 @@ version = "2.2.0"
 description = "A tool that automatically formats Python code to conform to the PEP 8 style guide"
 optional = false
 python-versions = ">=3.8"
+groups = ["dev"]
 files = [
     {file = "autopep8-2.2.0-py2.py3-none-any.whl", hash = "sha256:05418a981f038969d8bdcd5636bf15948db7555ae944b9f79b5a34b35f1370d4"},
     {file = "autopep8-2.2.0.tar.gz", hash = "sha256:d306a0581163ac29908280ad557773a95a9bede072c0fafed6f141f5311f43c1"},
@@ -104,6 +110,7 @@ version = "2.14.0"
 description = "Internationalization utilities"
 optional = false
 python-versions = ">=3.7"
+groups = ["main"]
 files = [
     {file = "Babel-2.14.0-py3-none-any.whl", hash = "sha256:efb1a25b7118e67ce3a259bed20545c29cb68be8ad2c784c83689981b7a57287"},
     {file = "Babel-2.14.0.tar.gz", hash = "sha256:6919867db036398ba21eb5c7a0f6b28ab8cbc3ae7a73a44ebe34ae74a4e7d363"},
@@ -118,6 +125,7 @@ version = "4.1.2"
 description = "Modern password hashing for your software and your servers"
 optional = false
 python-versions = ">=3.7"
+groups = ["main"]
 files = [
     {file = "bcrypt-4.1.2-cp37-abi3-macosx_10_12_universal2.whl", hash = "sha256:ac621c093edb28200728a9cca214d7e838529e557027ef0581685909acd28b5e"},
     {file = "bcrypt-4.1.2-cp37-abi3-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:ea505c97a5c465ab8c3ba75c0805a102ce526695cd6818c6de3b1a38f6f60da1"},
@@ -158,6 +166,7 @@ version = "4.12.3"
 description = "Screen-scraping library"
 optional = false
 python-versions = ">=3.6.0"
+groups = ["dev"]
 files = [
     {file = "beautifulsoup4-4.12.3-py3-none-any.whl", hash = "sha256:b80878c9f40111313e55da8ba20bdba06d8fa3969fc68304167741bbf9e082ed"},
     {file = "beautifulsoup4-4.12.3.tar.gz", hash = "sha256:74e3d1928edc070d21748185c46e3fb33490f22f52a3addee9aee0f4f7781051"},
@@ -179,6 +188,7 @@ version = "1.4.1"
 description = "Bibtex parser for python 3"
 optional = false
 python-versions = "*"
+groups = ["addons"]
 files = [
     {file = "bibtexparser-1.4.1.tar.gz", hash = "sha256:e00e29e24676c4808e0b4333b37bb55cca9cbb7871a56f63058509281588d789"},
 ]
@@ -192,6 +202,7 @@ version = "4.2.1"
 description = "Python multiprocessing fork with improvements and bugfixes"
 optional = false
 python-versions = ">=3.7"
+groups = ["main"]
 files = [
     {file = "billiard-4.2.1-py3-none-any.whl", hash = "sha256:40b59a4ac8806ba2c2369ea98d876bc6108b051c227baffd928c644d15d8f3cb"},
     {file = "billiard-4.2.1.tar.gz", hash = "sha256:12b641b0c539073fc8d3f5b8b7be998956665c4233c7c1fcd66a7e677c4fb36f"},
@@ -203,6 +214,7 @@ version = "6.1.0"
 description = "An easy safelist-based HTML-sanitizing tool."
 optional = false
 python-versions = ">=3.8"
+groups = ["main", "addons"]
 files = [
     {file = "bleach-6.1.0-py3-none-any.whl", hash = "sha256:3225f354cfc436b9789c66c4ee030194bee0568fbf9cbdad3bc8b5c26c5f12b6"},
     {file = "bleach-6.1.0.tar.gz", hash = "sha256:0a31f1837963c41d46bbf1331b8778e1308ea0791db03cc4e7357b97cf42a8fe"},
@@ -222,6 +234,7 @@ version = "1.7.0"
 description = "Fast, simple object-to-object and broadcast signaling"
 optional = false
 python-versions = ">=3.8"
+groups = ["main", "dev"]
 files = [
     {file = "blinker-1.7.0-py3-none-any.whl", hash = "sha256:c3f865d4d54db7abc53758a01601cf343fe55b84c1de4e3fa910e420b438d5b9"},
     {file = "blinker-1.7.0.tar.gz", hash = "sha256:e6820ff6fa4e4d1d8e2747c2283749c3f547e4fee112b98555cdcdae32996182"},
@@ -233,6 +246,7 @@ version = "0.1.14"
 description = "Client API for using the Boa infrastructure"
 optional = false
 python-versions = ">=3.5"
+groups = ["addons"]
 files = [
     {file = "boa-api-0.1.14.tar.gz", hash = "sha256:1b7e69b30b43d1966cc321271a4925657c654220eecb85f6e2eadd6e9c1f751c"},
     {file = "boa_api-0.1.14-py3-none-any.whl", hash = "sha256:b131dbfbc6ed04045aaff56f0520bde7f199b4940b99c136427cad3c22864d67"},
@@ -244,6 +258,7 @@ version = "1.34.60"
 description = "The AWS SDK for Python"
 optional = false
 python-versions = ">= 3.8"
+groups = ["main", "addons"]
 files = [
     {file = "boto3-1.34.60-py3-none-any.whl", hash = "sha256:199f11518b370e2ec1f6d5ec0c647eca967b6eb2cf6a332d9fc01a2144ea3690"},
     {file = "boto3-1.34.60.tar.gz", hash = "sha256:f78f30f4d6b1d5839ec20da9ffe0f3b36c1b404a415d208459a0b88c202a05e9"},
@@ -263,6 +278,7 @@ version = "1.34.162"
 description = "Low-level, data-driven core of boto 3."
 optional = false
 python-versions = ">=3.8"
+groups = ["main", "addons"]
 files = [
     {file = "botocore-1.34.162-py3-none-any.whl", hash = "sha256:2d918b02db88d27a75b48275e6fb2506e9adaaddbec1ffa6a8a0898b34e769be"},
     {file = "botocore-1.34.162.tar.gz", hash = "sha256:adc23be4fb99ad31961236342b7cbf3c0bfc62532cd02852196032e8c0d682f3"},
@@ -282,6 +298,7 @@ version = "3.9.2"
 description = "Official Box Python SDK"
 optional = false
 python-versions = "*"
+groups = ["addons"]
 files = [
     {file = "boxsdk-3.9.2-py2.py3-none-any.whl", hash = "sha256:44087bc208d3082e0a791f98e491c2eccc61cd5123cedc96e52d089e12c5f410"},
     {file = "boxsdk-3.9.2.tar.gz", hash = "sha256:10e23e2f82e9cff2b2e501b7ca7ffe7bac0e280d1cd4b2983dea95f826e3008b"},
@@ -308,6 +325,7 @@ version = "0.14.0"
 description = "httplib2 caching for requests"
 optional = false
 python-versions = ">=3.7"
+groups = ["addons"]
 files = [
     {file = "cachecontrol-0.14.0-py3-none-any.whl", hash = "sha256:f5bf3f0620c38db2e5122c0726bdebb0d16869de966ea6a2befe92470b740ea0"},
     {file = "cachecontrol-0.14.0.tar.gz", hash = "sha256:7db1195b41c81f8274a7bbd97c956f44e8348265a1bc7641c37dfebc39f0c938"},
@@ -328,6 +346,7 @@ version = "5.5.0"
 description = "Extensible memoizing collections and decorators"
 optional = false
 python-versions = ">=3.7"
+groups = ["main"]
 files = [
     {file = "cachetools-5.5.0-py3-none-any.whl", hash = "sha256:02134e8439cdc2ffb62023ce1debca2944c3f289d66bb17ead3ab3dede74b292"},
     {file = "cachetools-5.5.0.tar.gz", hash = "sha256:2cc24fb4cbe39633fb7badd9db9ca6295d766d9c2995f245725a46715d050f2a"},
@@ -339,6 +358,7 @@ version = "5.3.6"
 description = "Distributed Task Queue."
 optional = false
 python-versions = ">=3.8"
+groups = ["main"]
 files = [
     {file = "celery-5.3.6-py3-none-any.whl", hash = "sha256:9da4ea0118d232ce97dff5ed4974587fb1c0ff5c10042eb15278487cdd27d1af"},
     {file = "celery-5.3.6.tar.gz", hash = "sha256:870cc71d737c0200c397290d730344cc991d13a057534353d124c9380267aab9"},
@@ -359,31 +379,31 @@ vine = ">=5.1.0,<6.0"
 arangodb = ["pyArango (>=2.0.2)"]
 auth = ["cryptography (==41.0.5)"]
 azureblockblob = ["azure-storage-blob (>=12.15.0)"]
-brotli = ["brotli (>=1.0.0)", "brotlipy (>=0.7.0)"]
+brotli = ["brotli (>=1.0.0) ; platform_python_implementation == \"CPython\"", "brotlipy (>=0.7.0) ; platform_python_implementation == \"PyPy\""]
 cassandra = ["cassandra-driver (>=3.25.0,<4)"]
 consul = ["python-consul2 (==0.1.5)"]
 cosmosdbsql = ["pydocumentdb (==2.3.5)"]
-couchbase = ["couchbase (>=3.0.0)"]
+couchbase = ["couchbase (>=3.0.0) ; platform_python_implementation != \"PyPy\" and (platform_system != \"Windows\" or python_version < \"3.10\")"]
 couchdb = ["pycouchdb (==1.14.2)"]
 django = ["Django (>=2.2.28)"]
 dynamodb = ["boto3 (>=1.26.143)"]
 elasticsearch = ["elastic-transport (<=8.10.0)", "elasticsearch (<=8.11.0)"]
-eventlet = ["eventlet (>=0.32.0)"]
+eventlet = ["eventlet (>=0.32.0) ; python_version < \"3.10\""]
 gevent = ["gevent (>=1.5.0)"]
-librabbitmq = ["librabbitmq (>=2.0.0)"]
-memcache = ["pylibmc (==1.6.3)"]
+librabbitmq = ["librabbitmq (>=2.0.0) ; python_version < \"3.11\""]
+memcache = ["pylibmc (==1.6.3) ; platform_system != \"Windows\""]
 mongodb = ["pymongo[srv] (>=4.0.2)"]
 msgpack = ["msgpack (==1.0.7)"]
 pymemcache = ["python-memcached (==1.59)"]
-pyro = ["pyro4 (==4.82)"]
+pyro = ["pyro4 (==4.82) ; python_version < \"3.11\""]
 pytest = ["pytest-celery (==0.0.0)"]
 redis = ["redis (>=4.5.2,!=4.5.5,<6.0.0)"]
 s3 = ["boto3 (>=1.26.143)"]
 slmq = ["softlayer-messaging (>=1.0.3)"]
-solar = ["ephem (==4.1.5)"]
+solar = ["ephem (==4.1.5) ; platform_python_implementation != \"PyPy\""]
 sqlalchemy = ["sqlalchemy (>=1.4.48,<2.1)"]
-sqs = ["boto3 (>=1.26.143)", "kombu[sqs] (>=5.3.0)", "pycurl (>=7.43.0.5)", "urllib3 (>=1.26.16)"]
-tblib = ["tblib (>=1.3.0)", "tblib (>=1.5.0)"]
+sqs = ["boto3 (>=1.26.143)", "kombu[sqs] (>=5.3.0)", "pycurl (>=7.43.0.5) ; sys_platform != \"win32\" and platform_python_implementation == \"CPython\"", "urllib3 (>=1.26.16)"]
+tblib = ["tblib (>=1.3.0) ; python_version < \"3.8.0\"", "tblib (>=1.5.0) ; python_version >= \"3.8.0\""]
 yaml = ["PyYAML (>=3.10)"]
 zookeeper = ["kazoo (>=1.3.1)"]
 zstd = ["zstandard (==0.22.0)"]
@@ -394,6 +414,7 @@ version = "2024.2.2"
 description = "Python package for providing Mozilla's CA Bundle."
 optional = false
 python-versions = ">=3.6"
+groups = ["main", "addons", "dev"]
 files = [
     {file = "certifi-2024.2.2-py3-none-any.whl", hash = "sha256:dc383c07b76109f368f6106eee2b593b04a011ea4d55f652c6ca24a754d1cdd1"},
     {file = "certifi-2024.2.2.tar.gz", hash = "sha256:0569859f95fc761b18b45ef421b1290a0f65f147e92a1e5eb3e635f9a5e4e66f"},
@@ -405,6 +426,8 @@ version = "1.17.1"
 description = "Foreign Function Interface for Python calling C code."
 optional = false
 python-versions = ">=3.8"
+groups = ["main", "addons"]
+markers = "platform_python_implementation != \"PyPy\""
 files = [
     {file = "cffi-1.17.1-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:df8b1c11f177bc2313ec4b2d46baec87a5f3e71fc8b45dab2ee7cae86d9aba14"},
     {file = "cffi-1.17.1-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:8f2cdc858323644ab277e9bb925ad72ae0e67f69e804f4898c070998d50b1a67"},
@@ -484,6 +507,7 @@ version = "3.4.0"
 description = "Validate configuration and produce human readable error messages."
 optional = false
 python-versions = ">=3.8"
+groups = ["dev"]
 files = [
     {file = "cfgv-3.4.0-py2.py3-none-any.whl", hash = "sha256:b7265b1f29fd3316bfcd2b330d63d024f2bfd8bcb8b0272f8e19a504856c48f9"},
     {file = "cfgv-3.4.0.tar.gz", hash = "sha256:e52591d4c5f5dead8e0f673fb16db7949d2cfb3f7da4582893288f0ded8fe560"},
@@ -495,6 +519,7 @@ version = "3.3.2"
 description = "The Real First Universal Charset Detector. Open, modern and actively maintained alternative to Chardet."
 optional = false
 python-versions = ">=3.7.0"
+groups = ["main", "addons", "dev"]
 files = [
     {file = "charset-normalizer-3.3.2.tar.gz", hash = "sha256:f30c3cb33b24454a82faecaf01b19c18562b1e89558fb6c56de4d9118a032fd5"},
     {file = "charset_normalizer-3.3.2-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:25baf083bf6f6b341f4121c2f3c548875ee6f5339300e08be3f2b2ba1721cdd3"},
@@ -594,6 +619,7 @@ version = "0.6.0"
 description = "Citations and bibliography formatter"
 optional = false
 python-versions = ">=3.6"
+groups = ["main"]
 files = [
     {file = "citeproc-py-0.6.0.tar.gz", hash = "sha256:d9e3a224f936fe2e5033b5d9ffdacab769cedb61d96c4e0cf2f0b488f1d24b4e"},
     {file = "citeproc_py-0.6.0-py3-none-any.whl", hash = "sha256:ca4c7a5158d6f68cb00a89bb47d9aa0eec7b89b18e574eb08a061b011b602bbe"},
@@ -608,6 +634,7 @@ version = "8.1.7"
 description = "Composable command line interface toolkit"
 optional = false
 python-versions = ">=3.7"
+groups = ["main"]
 files = [
     {file = "click-8.1.7-py3-none-any.whl", hash = "sha256:ae74fb96c20a0277a1d615f1e4d73c8414f5a98db8b799a7931d1582f3390c28"},
     {file = "click-8.1.7.tar.gz", hash = "sha256:ca9853ad459e787e2192211578cc907e7594e294c7ccc834310722b41b9ca6de"},
@@ -622,6 +649,7 @@ version = "0.3.1"
 description = "Enables git-like *did-you-mean* feature in click"
 optional = false
 python-versions = ">=3.6.2"
+groups = ["main"]
 files = [
     {file = "click_didyoumean-0.3.1-py3-none-any.whl", hash = "sha256:5c4bb6007cfea5f2fd6583a2fb6701a22a41eb98957e63d0fac41c10e7c3117c"},
     {file = "click_didyoumean-0.3.1.tar.gz", hash = "sha256:4f82fdff0dbe64ef8ab2279bd6aa3f6a99c3b28c05aa09cbfc07c9d7fbb5a463"},
@@ -636,6 +664,7 @@ version = "1.1.1"
 description = "An extension module for click to enable registering CLI commands via setuptools entry-points."
 optional = false
 python-versions = "*"
+groups = ["main"]
 files = [
     {file = "click-plugins-1.1.1.tar.gz", hash = "sha256:46ab999744a9d831159c3411bb0c79346d94a444df9a3a3742e9ed63645f264b"},
     {file = "click_plugins-1.1.1-py2.py3-none-any.whl", hash = "sha256:5d262006d3222f5057fd81e1623d4443e41dcda5dc815c06b442aa3c02889fc8"},
@@ -653,6 +682,7 @@ version = "0.3.0"
 description = "REPL plugin for Click"
 optional = false
 python-versions = ">=3.6"
+groups = ["main"]
 files = [
     {file = "click-repl-0.3.0.tar.gz", hash = "sha256:17849c23dba3d667247dc4defe1757fff98694e90fe37474f3feebb69ced26a9"},
     {file = "click_repl-0.3.0-py3-none-any.whl", hash = "sha256:fb7e06deb8da8de86180a33a9da97ac316751c094c6899382da7feeeeb51b812"},
@@ -671,10 +701,12 @@ version = "0.4.6"
 description = "Cross-platform colored terminal text."
 optional = false
 python-versions = "!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*,!=3.5.*,!=3.6.*,>=2.7"
+groups = ["main", "dev"]
 files = [
     {file = "colorama-0.4.6-py2.py3-none-any.whl", hash = "sha256:4f1d9991f5acc0ca119f9d443620b77f9d6b33703e51011c16baf57afb285fc6"},
     {file = "colorama-0.4.6.tar.gz", hash = "sha256:08695f5cb7ed6e0531a20572697297273c47b8cae5a63ffc6d6ed5c201be6e44"},
 ]
+markers = {main = "platform_system == \"Windows\" or sys_platform == \"win32\"", dev = "sys_platform == \"win32\""}
 
 [[package]]
 name = "colorlog"
@@ -682,6 +714,7 @@ version = "6.8.2"
 description = "Add colours to the output of Python's logging module."
 optional = false
 python-versions = ">=3.6"
+groups = ["main"]
 files = [
     {file = "colorlog-6.8.2-py3-none-any.whl", hash = "sha256:4dcbb62368e2800cb3c5abd348da7e53f6c362dda502ec27c560b2e58a66bd33"},
     {file = "colorlog-6.8.2.tar.gz", hash = "sha256:3e3e079a41feb5a1b64f978b5ea4f46040a94f11f0e8bbb8261e3dbbeca64d44"},
@@ -699,6 +732,7 @@ version = "21.6.0"
 description = "Backports and enhancements for the contextlib module"
 optional = false
 python-versions = ">=3.6"
+groups = ["dev"]
 files = [
     {file = "contextlib2-21.6.0-py2.py3-none-any.whl", hash = "sha256:3fbdb64466afd23abaf6c977627b75b6139a5a3e8ce38405c5b413aed7a0471f"},
     {file = "contextlib2-21.6.0.tar.gz", hash = "sha256:ab1e2bfe1d01d968e1b7e8d9023bc51ef3509bba217bb730cee3827e1ee82869"},
@@ -710,6 +744,7 @@ version = "7.6.1"
 description = "Code coverage measurement for Python"
 optional = false
 python-versions = ">=3.8"
+groups = ["dev"]
 files = [
     {file = "coverage-7.6.1-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:b06079abebbc0e89e6163b8e8f0e16270124c154dc6e4a47b413dd538859af16"},
     {file = "coverage-7.6.1-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:cf4b19715bccd7ee27b6b120e7e9dd56037b9c0681dcc1adc9ba9db3d417fa36"},
@@ -786,7 +821,7 @@ files = [
 ]
 
 [package.extras]
-toml = ["tomli"]
+toml = ["tomli ; python_full_version <= \"3.11.0a6\""]
 
 [[package]]
 name = "cron-descriptor"
@@ -794,6 +829,7 @@ version = "1.4.5"
 description = "A Python library that converts cron expressions into human readable strings."
 optional = false
 python-versions = "*"
+groups = ["main"]
 files = [
     {file = "cron_descriptor-1.4.5-py3-none-any.whl", hash = "sha256:736b3ae9d1a99bc3dbfc5b55b5e6e7c12031e7ba5de716625772f8b02dcd6013"},
     {file = "cron_descriptor-1.4.5.tar.gz", hash = "sha256:f51ce4ffc1d1f2816939add8524f206c376a42c87a5fca3091ce26725b3b1bca"},
@@ -808,6 +844,7 @@ version = "42.0.5"
 description = "cryptography is a package which provides cryptographic recipes and primitives to Python developers."
 optional = false
 python-versions = ">=3.7"
+groups = ["main", "addons"]
 files = [
     {file = "cryptography-42.0.5-cp37-abi3-macosx_10_12_universal2.whl", hash = "sha256:a30596bae9403a342c978fb47d9b0ee277699fa53bbafad14706af51fe543d16"},
     {file = "cryptography-42.0.5-cp37-abi3-macosx_10_12_x86_64.whl", hash = "sha256:b7ffe927ee6531c78f81aa17e684e2ff617daeba7f189f911065b2ea2d526dec"},
@@ -862,6 +899,7 @@ version = "1.1.3"
 description = "Python API wrapper for the DataCite Metadata Store API."
 optional = false
 python-versions = "*"
+groups = ["main"]
 files = [
     {file = "datacite-1.1.3-py2.py3-none-any.whl", hash = "sha256:d5b4587019ae66d09d6679df4f0adf157b40e8b1da371739e4ecf2301fd6530f"},
     {file = "datacite-1.1.3.tar.gz", hash = "sha256:86461b16f1990090aee56cc11f29a60f71eff006227a9d577cf4bc628f21f5a9"},
@@ -884,6 +922,7 @@ version = "0.1.2"
 description = "Python client for Dataverse version 3.X"
 optional = false
 python-versions = "*"
+groups = ["addons"]
 files = []
 develop = false
 
@@ -908,6 +947,7 @@ version = "5.1.1"
 description = "Decorators for Humans"
 optional = false
 python-versions = ">=3.5"
+groups = ["dev"]
 files = [
     {file = "decorator-5.1.1-py3-none-any.whl", hash = "sha256:b8c3f85900b9dc423225913c5aace94729fe1fa9763b38939a95226f02d37186"},
     {file = "decorator-5.1.1.tar.gz", hash = "sha256:637996211036b6385ef91435e4fae22989472f9d571faba8927ba8253acbc330"},
@@ -919,6 +959,7 @@ version = "0.3.8"
 description = "Distribution utilities"
 optional = false
 python-versions = "*"
+groups = ["dev"]
 files = [
     {file = "distlib-0.3.8-py2.py3-none-any.whl", hash = "sha256:034db59a0b96f8ca18035f36290806a9a6e6bd9d1ff91e45a7f172eb17e51784"},
     {file = "distlib-0.3.8.tar.gz", hash = "sha256:1530ea13e350031b6312d8580ddb6b27a104275a31106523b8f123787f494f64"},
@@ -930,6 +971,7 @@ version = "4.2.17"
 description = "A high-level Python web framework that encourages rapid development and clean, pragmatic design."
 optional = false
 python-versions = ">=3.8"
+groups = ["main", "dev"]
 files = [
     {file = "Django-4.2.17-py3-none-any.whl", hash = "sha256:3a93350214ba25f178d4045c0786c61573e7dbfa3c509b3551374f1e11ba8de0"},
     {file = "Django-4.2.17.tar.gz", hash = "sha256:6b56d834cc94c8b21a8f4e775064896be3b4a4ca387f2612d4406a5927cd2fdc"},
@@ -950,6 +992,7 @@ version = "2.2.0"
 description = "Bulk update using one query over Django ORM."
 optional = false
 python-versions = "*"
+groups = ["main"]
 files = [
     {file = "django-bulk-update-2.2.0.tar.gz", hash = "sha256:5ab7ce8a65eac26d19143cc189c0f041d5c03b9d1b290ca240dc4f3d6aaeb337"},
     {file = "django_bulk_update-2.2.0-py2.py3-none-any.whl", hash = "sha256:49a403392ae05ea872494d74fb3dfa3515f8df5c07cc277c3dc94724c0ee6985"},
@@ -964,6 +1007,7 @@ version = "2.6.0"
 description = "Database-backed Periodic Tasks."
 optional = false
 python-versions = "*"
+groups = ["main"]
 files = [
     {file = "django-celery-beat-2.6.0.tar.gz", hash = "sha256:f75b2d129731f1214be8383e18fae6bfeacdb55dffb2116ce849222c0106f9ad"},
 ]
@@ -982,6 +1026,7 @@ version = "2.5.1"
 description = "Celery result backends for Django."
 optional = false
 python-versions = "*"
+groups = ["main"]
 files = [
     {file = "django_celery_results-2.5.1-py3-none-any.whl", hash = "sha256:0da4cd5ecc049333e4524a23fcfc3460dfae91aa0a60f1fae4b6b2889c254e01"},
     {file = "django_celery_results-2.5.1.tar.gz", hash = "sha256:3ecb7147f773f34d0381bac6246337ce4cf88a2ea7b82774ed48e518b67bb8fd"},
@@ -997,6 +1042,7 @@ version = "4.3.1"
 description = "django-cors-headers is a Django application for handling the server headers required for Cross-Origin Resource Sharing (CORS)."
 optional = false
 python-versions = ">=3.8"
+groups = ["main"]
 files = [
     {file = "django-cors-headers-4.3.1.tar.gz", hash = "sha256:0bf65ef45e606aff1994d35503e6b677c0b26cafff6506f8fd7187f3be840207"},
     {file = "django_cors_headers-4.3.1-py3-none-any.whl", hash = "sha256:0b1fd19297e37417fc9f835d39e45c8c642938ddba1acce0c1753d3edef04f36"},
@@ -1012,6 +1058,7 @@ version = "4.3.0"
 description = "A configurable set of panels that display various debug information about the current request/response."
 optional = false
 python-versions = ">=3.8"
+groups = ["dev"]
 files = [
     {file = "django_debug_toolbar-4.3.0-py3-none-any.whl", hash = "sha256:e09b7dcb8417b743234dfc57c95a7c1d1d87a88844abd13b4c5387f807b31bf6"},
     {file = "django_debug_toolbar-4.3.0.tar.gz", hash = "sha256:0b0dddee5ea29b9cb678593bc0d7a6d76b21d7799cb68e091a2148341a80f3c4"},
@@ -1027,6 +1074,7 @@ version = "1.9.2"
 description = "Tracking dirty fields on a Django model instance."
 optional = false
 python-versions = ">=3.7"
+groups = ["main"]
 files = [
     {file = "django-dirtyfields-1.9.2.tar.gz", hash = "sha256:eb2dbed51c2a9bc23e84d19797f4cd074f59c935f8f39bb716d185dc6b86401a"},
     {file = "django_dirtyfields-1.9.2-py3-none-any.whl", hash = "sha256:93b272eab993f813faabf3ea842ebfad63a03712e7213291aebdbddc5a012a5d"},
@@ -1041,6 +1089,7 @@ version = "2022.0.6"
 description = "Django app for storing time-series metrics in Elasticsearch."
 optional = false
 python-versions = "*"
+groups = ["main"]
 files = []
 develop = false
 
@@ -1064,6 +1113,7 @@ version = "3.2.3"
 description = "Extensions for Django"
 optional = false
 python-versions = ">=3.6"
+groups = ["main"]
 files = [
     {file = "django-extensions-3.2.3.tar.gz", hash = "sha256:44d27919d04e23b3f40231c4ab7af4e61ce832ef46d610cc650d53e68328410a"},
     {file = "django_extensions-3.2.3-py3-none-any.whl", hash = "sha256:9600b7562f79a92cbf1fde6403c04fee314608fefbb595502e34383ae8203401"},
@@ -1078,6 +1128,7 @@ version = "2.4.0"
 description = "Implementation of per object permissions for Django."
 optional = false
 python-versions = ">=3.5"
+groups = ["main"]
 files = [
     {file = "django-guardian-2.4.0.tar.gz", hash = "sha256:c58a68ae76922d33e6bdc0e69af1892097838de56e93e78a8361090bcd9f89a0"},
     {file = "django_guardian-2.4.0-py3-none-any.whl", hash = "sha256:440ca61358427e575323648b25f8384739e54c38b3d655c81d75e0cd0d61b697"},
@@ -1092,6 +1143,7 @@ version = "5.4.0"
 description = "Full featured redis cache backend for Django."
 optional = false
 python-versions = ">=3.6"
+groups = ["main"]
 files = [
     {file = "django-redis-5.4.0.tar.gz", hash = "sha256:6a02abaa34b0fea8bf9b707d2c363ab6adc7409950b2db93602e6cb292818c42"},
     {file = "django_redis-5.4.0-py3-none-any.whl", hash = "sha256:ebc88df7da810732e2af9987f7f426c96204bf89319df4c6da6ca9a2942edd5b"},
@@ -1110,10 +1162,10 @@ version = "1.2.3"
 description = "An implementation of Django's EmailBackend compatible with sendgrid-python v5+"
 optional = false
 python-versions = "*"
+groups = ["main"]
 files = [
     {file = "django-sendgrid-v5-1.2.3.tar.gz", hash = "sha256:3887aafbb10d5b808efc2c1031dcd96fd357d542eb5affe38fef07cc0f3cfae9"},
     {file = "django_sendgrid_v5-1.2.3-py2.py3-none-any.whl", hash = "sha256:2d2fa8a085d21c95e5f97fc60b61f199ccc57a27df8da90cd3f29a5702346dc6"},
-    {file = "django_sendgrid_v5-1.2.3-py3-none-any.whl", hash = "sha256:f6a44ee37c1c3cc7d683a43c55ead530417be1849a8a41bde02b158009559d9d"},
 ]
 
 [package.dependencies]
@@ -1127,6 +1179,7 @@ version = "5.1.0"
 description = "Silky smooth profiling for the Django Framework"
 optional = false
 python-versions = ">=3.8"
+groups = ["dev"]
 files = [
     {file = "django-silk-5.1.0.tar.gz", hash = "sha256:34abb5852315f0f3303d45b7ab4a2caa9cf670102b614dbb2ac40a5d2d5cbffb"},
     {file = "django_silk-5.1.0-py3-none-any.whl", hash = "sha256:35a2051672b0be86af4ce734a0df0b6674c8c63f2df730b3756ec6e52923707d"},
@@ -1144,6 +1197,7 @@ version = "1.14.3"
 description = "Support for many storage backends in Django"
 optional = false
 python-versions = ">=3.7"
+groups = ["main"]
 files = [
     {file = "django-storages-1.14.3.tar.gz", hash = "sha256:95a12836cd998d4c7a4512347322331c662d9114c4344f932f5e9c0fce000608"},
     {file = "django_storages-1.14.3-py3-none-any.whl", hash = "sha256:31f263389e95ce3a1b902fb5f739a7ed32895f7d8b80179fe7453ecc0dfe102e"},
@@ -1155,7 +1209,7 @@ Django = ">=3.2"
 [package.extras]
 azure = ["azure-core (>=1.13)", "azure-storage-blob (>=12)"]
 boto3 = ["boto3 (>=1.4.4)"]
-dropbox = ["dropbox (>=7.2.1)"]
+dropbox = ["dropbox (>=7.2.1) ; python_version < \"3.12\""]
 google = ["google-cloud-storage (>=1.27)"]
 libcloud = ["apache-libcloud"]
 s3 = ["boto3 (>=1.4.4)"]
@@ -1167,6 +1221,7 @@ version = "6.1.0"
 description = "A Django app providing DB, form, and REST framework fields for zoneinfo and pytz timezone objects."
 optional = false
 python-versions = ">=3.8,<4.0"
+groups = ["main"]
 files = [
     {file = "django_timezone_field-6.1.0-py3-none-any.whl", hash = "sha256:0095f43da716552fcc606783cfb42cb025892514f1ec660ebfa96186eb83b74c"},
     {file = "django_timezone_field-6.1.0.tar.gz", hash = "sha256:d40f7059d7bae4075725d04a9dae601af9fe3c7f0119a69b0e2c6194a782f797"},
@@ -1181,6 +1236,7 @@ version = "0.14.0"
 description = "Sane single table model inheritance for Django"
 optional = false
 python-versions = "*"
+groups = ["main"]
 files = [
     {file = "django-typed-models-0.14.0.tar.gz", hash = "sha256:1d374f9fc3c7aedcfbaada9200c0b489c3d2262c275a499141c2dcfc7472a5b7"},
     {file = "django_typed_models-0.14.0-py3-none-any.whl", hash = "sha256:efb51da12e51492b95c32798c0c9ac2b4caa05b0138391b676bc3e8b9ca2e5dd"},
@@ -1192,6 +1248,7 @@ version = "4.1.0"
 description = "A feature flipper for Django."
 optional = false
 python-versions = ">=3.8"
+groups = ["main"]
 files = [
     {file = "django-waffle-4.1.0.tar.gz", hash = "sha256:e49d7d461d89f3bd8e53f20efe39310acca8f275c9888495e68e195345bf18b1"},
     {file = "django_waffle-4.1.0-py3-none-any.whl", hash = "sha256:5979a2f3dd674ef7086480525b39651fc2045427f6d8e6a614192656d3402c5b"},
@@ -1206,6 +1263,7 @@ version = "3.1.0"
 description = "Transparently use webpack with django"
 optional = false
 python-versions = "*"
+groups = ["main"]
 files = []
 develop = false
 
@@ -1221,6 +1279,7 @@ version = "3.15.1"
 description = "Web APIs for Django, made easy."
 optional = false
 python-versions = ">=3.6"
+groups = ["main"]
 files = [
     {file = "djangorestframework-3.15.1-py3-none-any.whl", hash = "sha256:3ccc0475bce968608cf30d07fb17d8e52d1d7fc8bfe779c905463200750cbca6"},
     {file = "djangorestframework-3.15.1.tar.gz", hash = "sha256:f88fad74183dfc7144b2756d0d2ac716ea5b4c7c9840995ac3bfd8ec034333c1"},
@@ -1235,6 +1294,7 @@ version = "0.2.1"
 description = "Django REST Framework bulk CRUD view mixins"
 optional = false
 python-versions = "*"
+groups = ["main"]
 files = [
     {file = "djangorestframework-bulk-0.2.1.tar.gz", hash = "sha256:39230d8379acebd86d313df6c9150cafecb636eae1d097c30a26389ab9fee5b1"},
 ]
@@ -1250,6 +1310,7 @@ version = "3.0.2"
 description = "CSV Tools for Django REST Framework"
 optional = false
 python-versions = "*"
+groups = ["main"]
 files = [
     {file = "djangorestframework-csv-3.0.2.tar.gz", hash = "sha256:b269b692feda1971e1342f395a21d339c6a16d2961ff64357a9a6188f27af10f"},
     {file = "djangorestframework_csv-3.0.2-py3-none-any.whl", hash = "sha256:d1bcfbaaeaa5145af6bb0985a36a5bbf2f853d9961c722f69c7b0c9c3bcc269a"},
@@ -1264,6 +1325,7 @@ version = "2.6.1"
 description = "DNS toolkit"
 optional = false
 python-versions = ">=3.8"
+groups = ["main"]
 files = [
     {file = "dnspython-2.6.1-py3-none-any.whl", hash = "sha256:5ef3b9680161f6fa89daf8ad451b5f1a33b18ae8a1c6778cdf4b43f08c0a6e50"},
     {file = "dnspython-2.6.1.tar.gz", hash = "sha256:e8f0f9c23a7b7cb99ded64e6c3a6f3e701d78f50c55e002b839dea7225cff7cc"},
@@ -1284,6 +1346,7 @@ version = "11.36.2"
 description = "Official Dropbox API Client"
 optional = false
 python-versions = "*"
+groups = ["addons"]
 files = [
     {file = "dropbox-11.36.2-py2-none-any.whl", hash = "sha256:afbfce2589b777ade1deaa2c186f3650c41e41cea0f1fac497a75112a171f8e2"},
     {file = "dropbox-11.36.2-py3-none-any.whl", hash = "sha256:a21e4d2bcbeb1d8067ff87969aea48792c9a8266182491153feff2be9c1b9c8f"},
@@ -1301,6 +1364,7 @@ version = "8.13.0"
 description = "Transport classes and utilities shared among Python Elastic client libraries"
 optional = false
 python-versions = ">=3.7"
+groups = ["main"]
 files = [
     {file = "elastic-transport-8.13.0.tar.gz", hash = "sha256:2410ec1ff51221e8b3a01c0afa9f0d0498e1386a269283801f5c12f98e42dc45"},
     {file = "elastic_transport-8.13.0-py3-none-any.whl", hash = "sha256:aec890afdddd057762b27ff3553b0be8fa4673ec1a4fd922dfbd00325874bb3d"},
@@ -1319,6 +1383,7 @@ version = "6.8.2"
 description = "Python client for Elasticsearch"
 optional = false
 python-versions = ">=2.6, !=3.0.*, !=3.1.*, !=3.2.*, <4"
+groups = ["main"]
 files = [
     {file = "elasticsearch-6.8.2-py2.py3-none-any.whl", hash = "sha256:1aedf00b73f5d1e77cb4df70fec58f2efb664be4ce2686374239aa6c0373c65c"},
     {file = "elasticsearch-6.8.2.tar.gz", hash = "sha256:c3a560bb83e4981b5a5c82080d2ceb99686d33692ef53365656129478aa5ddb2"},
@@ -1337,6 +1402,7 @@ version = "6.4.0"
 description = "Python client for Elasticsearch"
 optional = false
 python-versions = "*"
+groups = ["main"]
 files = [
     {file = "elasticsearch-dsl-6.4.0.tar.gz", hash = "sha256:26416f4dd46ceca43d62ef74970d9de4bdd6f4b0f163316f0b432c9e61a08bec"},
     {file = "elasticsearch_dsl-6.4.0-py2.py3-none-any.whl", hash = "sha256:f60aea7fd756ac1fbe7ce114bbf4949aefbf495dfe8896640e787c67344f12f6"},
@@ -1356,6 +1422,7 @@ version = "2.5.1"
 description = "Python client for Elasticsearch"
 optional = false
 python-versions = "*"
+groups = ["main"]
 files = [
     {file = "elasticsearch2-2.5.1-py2.py3-none-any.whl", hash = "sha256:457909966bc00c37ad5639950bc4d8f4606a60baa530a8ec6d9848ba3e60ab87"},
     {file = "elasticsearch2-2.5.1.tar.gz", hash = "sha256:f3bc508a37d04902610755777d3b20202121bdbce7b3717086e07a27affd62a6"},
@@ -1370,6 +1437,7 @@ version = "6.8.2"
 description = "Python client for Elasticsearch"
 optional = false
 python-versions = ">=2.6, !=3.0.*, !=3.1.*, !=3.2.*, <4"
+groups = ["main"]
 files = [
     {file = "elasticsearch6-6.8.2-py2.py3-none-any.whl", hash = "sha256:4edf2d61f854f642185d5af915b23c57e70d9f2b54f558b62ae55fa720583f5e"},
     {file = "elasticsearch6-6.8.2.tar.gz", hash = "sha256:7c215910b6bc18928d24d6c1d0b09b0684c824af609906d5e007a9a268109678"},
@@ -1388,6 +1456,7 @@ version = "6.4.0"
 description = "Python client for Elasticsearch"
 optional = false
 python-versions = "*"
+groups = ["main"]
 files = [
     {file = "elasticsearch6-dsl-6.4.0.tar.gz", hash = "sha256:4bbc60919b73484d028eca31f749f0eea80d8b0bfe0a9a33b54eb0afca1d9b5f"},
     {file = "elasticsearch6_dsl-6.4.0-py2.py3-none-any.whl", hash = "sha256:a5767ef65c50f7c8af7ba6c176bd8df2c1fb501c644bc196cbd675f15c0f2be1"},
@@ -1407,6 +1476,7 @@ version = "2.1.1"
 description = "A robust email address syntax and deliverability validation library."
 optional = false
 python-versions = ">=3.8"
+groups = ["main"]
 files = [
     {file = "email_validator-2.1.1-py3-none-any.whl", hash = "sha256:97d882d174e2a65732fb43bfce81a3a834cbc1bde8bf419e30ef5ea976370a05"},
     {file = "email_validator-2.1.1.tar.gz", hash = "sha256:200a70680ba08904be6d1eef729205cc0d687634399a5924d842533efb824b84"},
@@ -1422,6 +1492,7 @@ version = "2.1.1"
 description = "execnet: rapid multi-Python deployment"
 optional = false
 python-versions = ">=3.8"
+groups = ["dev"]
 files = [
     {file = "execnet-2.1.1-py3-none-any.whl", hash = "sha256:26dee51f1b80cebd6d0ca8e74dd8745419761d3bef34163928cbebbdc4749fdc"},
     {file = "execnet-2.1.1.tar.gz", hash = "sha256:5189b52c6121c24feae288166ab41b32549c7e2348652736540b9e6e7d4e72e3"},
@@ -1436,13 +1507,14 @@ version = "2.1.0"
 description = "Get the currently executing AST node of a frame, and other information"
 optional = false
 python-versions = ">=3.8"
+groups = ["dev"]
 files = [
     {file = "executing-2.1.0-py2.py3-none-any.whl", hash = "sha256:8d63781349375b5ebccc3142f4b30350c0cd9c79f921cde38be2be4637e98eaf"},
     {file = "executing-2.1.0.tar.gz", hash = "sha256:8ea27ddd260da8150fa5a708269c4a10e76161e2496ec3e587da9e3c0fe4b9ab"},
 ]
 
 [package.extras]
-tests = ["asttokens (>=2.1.0)", "coverage", "coverage-enable-subprocess", "ipython", "littleutils", "pytest", "rich"]
+tests = ["asttokens (>=2.1.0)", "coverage", "coverage-enable-subprocess", "ipython", "littleutils", "pytest", "rich ; python_version >= \"3.11\""]
 
 [[package]]
 name = "factory-boy"
@@ -1450,6 +1522,7 @@ version = "3.3.0"
 description = "A versatile test fixtures replacement based on thoughtbot's factory_bot for Ruby."
 optional = false
 python-versions = ">=3.7"
+groups = ["dev"]
 files = [
     {file = "factory_boy-3.3.0-py2.py3-none-any.whl", hash = "sha256:a2cdbdb63228177aa4f1c52f4b6d83fab2b8623bf602c7dedd7eb83c0f69c04c"},
     {file = "factory_boy-3.3.0.tar.gz", hash = "sha256:bc76d97d1a65bbd9842a6d722882098eb549ec8ee1081f9fb2e8ff29f0c300f1"},
@@ -1468,6 +1541,7 @@ version = "23.2.1"
 description = "Faker is a Python package that generates fake data for you."
 optional = false
 python-versions = ">=3.8"
+groups = ["dev"]
 files = [
     {file = "Faker-23.2.1-py3-none-any.whl", hash = "sha256:0520a6b97e07c658b2798d7140971c1d5bc4bcd5013e7937fe075fd054aa320c"},
     {file = "Faker-23.2.1.tar.gz", hash = "sha256:f07b64d27f67b62c7f0536a72f47813015b3b51cd4664918454011094321e464"},
@@ -1482,6 +1556,7 @@ version = "6.0.11"
 description = "Universal feed parser, handles RSS 0.9x, RSS 1.0, RSS 2.0, CDF, Atom 0.3, and Atom 1.0 feeds"
 optional = false
 python-versions = ">=3.6"
+groups = ["addons"]
 files = [
     {file = "feedparser-6.0.11-py3-none-any.whl", hash = "sha256:0be7ee7b395572b19ebeb1d6aafb0028dee11169f1c934e0ed67d54992f4ad45"},
     {file = "feedparser-6.0.11.tar.gz", hash = "sha256:c9d0407b64c6f2a065d0ebb292c2b35c01050cc0dc33757461aaabdc4c4184d5"},
@@ -1496,6 +1571,7 @@ version = "3.16.1"
 description = "A platform independent file lock."
 optional = false
 python-versions = ">=3.8"
+groups = ["dev"]
 files = [
     {file = "filelock-3.16.1-py3-none-any.whl", hash = "sha256:2082e5703d51fbf98ea75855d9d5527e33d8ff23099bec374a134febee6946b0"},
     {file = "filelock-3.16.1.tar.gz", hash = "sha256:c249fbfcd5db47e5e2d6d62198e565475ee65e4831e2561c8e313fa7eb961435"},
@@ -1504,7 +1580,7 @@ files = [
 [package.extras]
 docs = ["furo (>=2024.8.6)", "sphinx (>=8.0.2)", "sphinx-autodoc-typehints (>=2.4.1)"]
 testing = ["covdefaults (>=2.3)", "coverage (>=7.6.1)", "diff-cover (>=9.2)", "pytest (>=8.3.3)", "pytest-asyncio (>=0.24)", "pytest-cov (>=5)", "pytest-mock (>=3.14)", "pytest-timeout (>=2.3.1)", "virtualenv (>=20.26.4)"]
-typing = ["typing-extensions (>=4.12.2)"]
+typing = ["typing-extensions (>=4.12.2) ; python_version < \"3.11\""]
 
 [[package]]
 name = "flake8"
@@ -1512,6 +1588,7 @@ version = "7.0.0"
 description = "the modular source code checker: pep8 pyflakes and co"
 optional = false
 python-versions = ">=3.8.1"
+groups = ["dev"]
 files = [
     {file = "flake8-7.0.0-py2.py3-none-any.whl", hash = "sha256:a6dfbb75e03252917f2473ea9653f7cd799c3064e54d4c8140044c5c065f53c3"},
     {file = "flake8-7.0.0.tar.gz", hash = "sha256:33f96621059e65eec474169085dc92bf26e7b2d47366b70be2f67ab80dc25132"},
@@ -1528,6 +1605,7 @@ version = "1.2.0"
 description = "mutable defaults flake8 extension"
 optional = false
 python-versions = "*"
+groups = ["dev"]
 files = [
     {file = "flake8-mutable-1.2.0.tar.gz", hash = "sha256:ee9b77111b867d845177bbc289d87d541445ffcc6029a0c5c65865b42b18c6a6"},
     {file = "flake8_mutable-1.2.0-py2-none-any.whl", hash = "sha256:38fd9dadcbcda6550a916197bc40ed76908119dabb37fbcca30873666c31d2d5"},
@@ -1542,6 +1620,7 @@ version = "3.0.2"
 description = "A simple framework for building complex web applications."
 optional = false
 python-versions = ">=3.8"
+groups = ["main"]
 files = [
     {file = "flask-3.0.2-py3-none-any.whl", hash = "sha256:3232e0e9c850d781933cf0207523d1ece087eb8d87b23777ae38456e2fbe7c6e"},
     {file = "flask-3.0.2.tar.gz", hash = "sha256:822c03f4b799204250a7ee84b1eddc40665395333973dfb9deebfe425fefcb7d"},
@@ -1564,6 +1643,7 @@ version = "2.1.3"
 description = "URL manipulation made simple."
 optional = false
 python-versions = "*"
+groups = ["main"]
 files = [
     {file = "furl-2.1.3-py2.py3-none-any.whl", hash = "sha256:9ab425062c4217f9802508e45feb4a83e54324273ac4b202f1850363309666c0"},
     {file = "furl-2.1.3.tar.gz", hash = "sha256:5a6188fe2666c484a12159c18be97a1977a71d632ef5bb867ef15f54af39cc4e"},
@@ -1579,6 +1659,7 @@ version = "24.2.1"
 description = "Coroutine-based network library"
 optional = false
 python-versions = ">=3.8"
+groups = ["main"]
 files = [
     {file = "gevent-24.2.1-cp310-cp310-macosx_11_0_universal2.whl", hash = "sha256:6f947a9abc1a129858391b3d9334c45041c08a0f23d14333d5b844b6e5c17a07"},
     {file = "gevent-24.2.1-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:bde283313daf0b34a8d1bab30325f5cb0f4e11b5869dbe5bc61f8fe09a8f66f3"},
@@ -1630,11 +1711,11 @@ greenlet = {version = ">=3.0rc3", markers = "platform_python_implementation == \
 "zope.interface" = "*"
 
 [package.extras]
-dnspython = ["dnspython (>=1.16.0,<2.0)", "idna"]
+dnspython = ["dnspython (>=1.16.0,<2.0) ; python_version < \"3.10\"", "idna ; python_version < \"3.10\""]
 docs = ["furo", "repoze.sphinx.autointerface", "sphinx", "sphinxcontrib-programoutput", "zope.schema"]
-monitor = ["psutil (>=5.7.0)"]
-recommended = ["cffi (>=1.12.2)", "dnspython (>=1.16.0,<2.0)", "idna", "psutil (>=5.7.0)"]
-test = ["cffi (>=1.12.2)", "coverage (>=5.0)", "dnspython (>=1.16.0,<2.0)", "idna", "objgraph", "psutil (>=5.7.0)", "requests"]
+monitor = ["psutil (>=5.7.0) ; sys_platform != \"win32\" or platform_python_implementation == \"CPython\""]
+recommended = ["cffi (>=1.12.2) ; platform_python_implementation == \"CPython\"", "dnspython (>=1.16.0,<2.0) ; python_version < \"3.10\"", "idna ; python_version < \"3.10\"", "psutil (>=5.7.0) ; sys_platform != \"win32\" or platform_python_implementation == \"CPython\""]
+test = ["cffi (>=1.12.2) ; platform_python_implementation == \"CPython\"", "coverage (>=5.0) ; sys_platform != \"win32\"", "dnspython (>=1.16.0,<2.0) ; python_version < \"3.10\"", "idna ; python_version < \"3.10\"", "objgraph", "psutil (>=5.7.0) ; sys_platform != \"win32\" or platform_python_implementation == \"CPython\"", "requests"]
 
 [[package]]
 name = "github3-py"
@@ -1642,6 +1723,7 @@ version = "4.0.1"
 description = "Python wrapper for the GitHub API(http://developer.github.com/v3)"
 optional = false
 python-versions = ">=3.7"
+groups = ["addons"]
 files = [
     {file = "github3.py-4.0.1-py3-none-any.whl", hash = "sha256:a89af7de25650612d1da2f0609622bcdeb07ee8a45a1c06b2d16a05e4234e753"},
     {file = "github3.py-4.0.1.tar.gz", hash = "sha256:30d571076753efc389edc7f9aaef338a4fcb24b54d8968d5f39b1342f45ddd36"},
@@ -1663,6 +1745,7 @@ version = "2.20.0"
 description = "Google API client core library"
 optional = false
 python-versions = ">=3.7"
+groups = ["main"]
 files = [
     {file = "google_api_core-2.20.0-py3-none-any.whl", hash = "sha256:ef0591ef03c30bb83f79b3d0575c3f31219001fc9c5cf37024d08310aeffed8a"},
     {file = "google_api_core-2.20.0.tar.gz", hash = "sha256:f74dff1889ba291a4b76c5079df0711810e2d9da81abfdc99957bc961c1eb28f"},
@@ -1676,7 +1759,7 @@ protobuf = ">=3.19.5,<3.20.0 || >3.20.0,<3.20.1 || >3.20.1,<4.21.0 || >4.21.0,<4
 requests = ">=2.18.0,<3.0.0.dev0"
 
 [package.extras]
-grpc = ["grpcio (>=1.33.2,<2.0dev)", "grpcio (>=1.49.1,<2.0dev)", "grpcio-status (>=1.33.2,<2.0.dev0)", "grpcio-status (>=1.49.1,<2.0.dev0)"]
+grpc = ["grpcio (>=1.33.2,<2.0dev)", "grpcio (>=1.49.1,<2.0dev) ; python_version >= \"3.11\"", "grpcio-status (>=1.33.2,<2.0.dev0)", "grpcio-status (>=1.49.1,<2.0.dev0) ; python_version >= \"3.11\""]
 grpcgcp = ["grpcio-gcp (>=0.2.2,<1.0.dev0)"]
 grpcio-gcp = ["grpcio-gcp (>=0.2.2,<1.0.dev0)"]
 
@@ -1686,6 +1769,7 @@ version = "2.123.0"
 description = "Google API Client Library for Python"
 optional = false
 python-versions = ">=3.7"
+groups = ["main"]
 files = [
     {file = "google-api-python-client-2.123.0.tar.gz", hash = "sha256:a17226b02f71de581afe045437b441844110a9cd91580b73549d41108cf1b9f0"},
     {file = "google_api_python_client-2.123.0-py2.py3-none-any.whl", hash = "sha256:1c2bcaa846acf5bac4d6f244d8373d4de9de73d64eb6e77b56767ab4cf681419"},
@@ -1704,6 +1788,7 @@ version = "2.29.0"
 description = "Google Authentication Library"
 optional = false
 python-versions = ">=3.7"
+groups = ["main"]
 files = [
     {file = "google-auth-2.29.0.tar.gz", hash = "sha256:672dff332d073227550ffc7457868ac4218d6c500b155fe6cc17d2b13602c360"},
     {file = "google_auth-2.29.0-py2.py3-none-any.whl", hash = "sha256:d452ad095688cd52bae0ad6fafe027f6a6d6f560e810fec20914e17a09526415"},
@@ -1727,6 +1812,7 @@ version = "0.2.0"
 description = "Google Authentication Library: httplib2 transport"
 optional = false
 python-versions = "*"
+groups = ["main"]
 files = [
     {file = "google-auth-httplib2-0.2.0.tar.gz", hash = "sha256:38aa7badf48f974f1eb9861794e9c0cb2a0511a4ec0679b1f886d108f5640e05"},
     {file = "google_auth_httplib2-0.2.0-py2.py3-none-any.whl", hash = "sha256:b65a0a2123300dd71281a7bf6e64d65a0759287df52729bdd1ae2e47dc311a3d"},
@@ -1742,6 +1828,7 @@ version = "2.4.1"
 description = "Google Cloud API client core library"
 optional = false
 python-versions = ">=3.7"
+groups = ["main"]
 files = [
     {file = "google-cloud-core-2.4.1.tar.gz", hash = "sha256:9b7749272a812bde58fff28868d0c5e2f585b82f37e09a1f6ed2d4d10f134073"},
     {file = "google_cloud_core-2.4.1-py2.py3-none-any.whl", hash = "sha256:a9e6a4422b9ac5c29f79a0ede9485473338e2ce78d91f2370c01e730eab22e61"},
@@ -1760,6 +1847,7 @@ version = "2.16.0"
 description = "Google Cloud Storage API client library"
 optional = false
 python-versions = ">=3.7"
+groups = ["main"]
 files = [
     {file = "google-cloud-storage-2.16.0.tar.gz", hash = "sha256:dda485fa503710a828d01246bd16ce9db0823dc51bbca742ce96a6817d58669f"},
     {file = "google_cloud_storage-2.16.0-py2.py3-none-any.whl", hash = "sha256:91a06b96fb79cf9cdfb4e759f178ce11ea885c79938f89590344d079305f5852"},
@@ -1782,6 +1870,7 @@ version = "1.6.0"
 description = "A python wrapper of the C library 'Google CRC32C'"
 optional = false
 python-versions = ">=3.9"
+groups = ["main"]
 files = [
     {file = "google_crc32c-1.6.0-cp310-cp310-macosx_12_0_arm64.whl", hash = "sha256:5bcc90b34df28a4b38653c36bb5ada35671ad105c99cfe915fb5bed7ad6924aa"},
     {file = "google_crc32c-1.6.0-cp310-cp310-macosx_12_0_x86_64.whl", hash = "sha256:d9e9913f7bd69e093b81da4535ce27af842e7bf371cde42d1ae9e9bd382dc0e9"},
@@ -1821,6 +1910,7 @@ version = "2.7.2"
 description = "Utilities for Google Media Downloads and Resumable Uploads"
 optional = false
 python-versions = ">=3.7"
+groups = ["main"]
 files = [
     {file = "google_resumable_media-2.7.2-py2.py3-none-any.whl", hash = "sha256:3ce7551e9fe6d99e9a126101d2536612bb73486721951e9562fee0f90c6ababa"},
     {file = "google_resumable_media-2.7.2.tar.gz", hash = "sha256:5280aed4629f2b60b847b0d42f9857fd4935c11af266744df33d8074cae92fe0"},
@@ -1839,6 +1929,7 @@ version = "1.65.0"
 description = "Common protobufs used in Google APIs"
 optional = false
 python-versions = ">=3.7"
+groups = ["main"]
 files = [
     {file = "googleapis_common_protos-1.65.0-py2.py3-none-any.whl", hash = "sha256:2972e6c496f435b92590fd54045060867f3fe9be2c82ab148fc8885035479a63"},
     {file = "googleapis_common_protos-1.65.0.tar.gz", hash = "sha256:334a29d07cddc3aa01dee4988f9afd9b2916ee2ff49d6b757155dc0d197852c0"},
@@ -1856,6 +1947,7 @@ version = "2024.6.6"
 description = "Generate a dot graph from the output of several profilers."
 optional = false
 python-versions = ">=3.8"
+groups = ["dev"]
 files = [
     {file = "gprof2dot-2024.6.6-py2.py3-none-any.whl", hash = "sha256:45b14ad7ce64e299c8f526881007b9eb2c6b75505d5613e96e66ee4d5ab33696"},
     {file = "gprof2dot-2024.6.6.tar.gz", hash = "sha256:fa1420c60025a9eb7734f65225b4da02a10fc6dd741b37fa129bc6b41951e5ab"},
@@ -1867,6 +1959,8 @@ version = "3.1.1"
 description = "Lightweight in-process concurrent programming"
 optional = false
 python-versions = ">=3.7"
+groups = ["main"]
+markers = "platform_python_implementation == \"CPython\""
 files = [
     {file = "greenlet-3.1.1-cp310-cp310-macosx_11_0_universal2.whl", hash = "sha256:0bbae94a29c9e5c7e4a2b7f0aae5c17e8e90acbfd3bf6270eeba60c39fce3563"},
     {file = "greenlet-3.1.1-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:0fde093fb93f35ca72a556cf72c92ea3ebfda3d79fc35bb19fbe685853869a83"},
@@ -1953,6 +2047,7 @@ version = "1.3.1"
 description = "Implements the hashids algorithm in python. For more information, visit http://hashids.org/"
 optional = false
 python-versions = ">=2.7"
+groups = ["main"]
 files = [
     {file = "hashids-1.3.1-py2.py3-none-any.whl", hash = "sha256:8bddd1acba501bfc9306e7e5a99a1667f4f2cacdc20cbd70bcc5ddfa5147c94c"},
     {file = "hashids-1.3.1.tar.gz", hash = "sha256:6c3dc775e65efc2ce2c157a65acb776d634cb814598f406469abef00ae3f635c"},
@@ -1967,6 +2062,7 @@ version = "0.22.0"
 description = "A comprehensive HTTP client library."
 optional = false
 python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*"
+groups = ["main"]
 files = [
     {file = "httplib2-0.22.0-py3-none-any.whl", hash = "sha256:14ae0a53c1ba8f3d37e9e27cf37eabb0fb9980f435ba405d546948b009dd64dc"},
     {file = "httplib2-0.22.0.tar.gz", hash = "sha256:d7a10bc5ef5ab08322488bde8c726eeee5c8618723fdb399597ec58f3d82df81"},
@@ -1981,6 +2077,7 @@ version = "2.6.1"
 description = "File identification library for Python"
 optional = false
 python-versions = ">=3.8"
+groups = ["dev"]
 files = [
     {file = "identify-2.6.1-py2.py3-none-any.whl", hash = "sha256:53863bcac7caf8d2ed85bd20312ea5dcfc22226800f6d6881f232d861db5a8f0"},
     {file = "identify-2.6.1.tar.gz", hash = "sha256:91478c5fb7c3aac5ff7bf9b4344f803843dc586832d5f110d672b19aa1984c98"},
@@ -1995,6 +2092,7 @@ version = "3.10"
 description = "Internationalized Domain Names in Applications (IDNA)"
 optional = false
 python-versions = ">=3.6"
+groups = ["main", "addons", "dev"]
 files = [
     {file = "idna-3.10-py3-none-any.whl", hash = "sha256:946d195a0d259cbba61165e88e65941f16e9b36ea6ddb97f00452bae8b1287d3"},
     {file = "idna-3.10.tar.gz", hash = "sha256:12f65c9b470abda6dc35cf8e63cc574b1c52b11df2c86030af0ac09b01b13ea9"},
@@ -2009,6 +2107,7 @@ version = "1.2.1"
 description = "\"Small library for persistent identifiers used in scholarly communication.\""
 optional = false
 python-versions = ">=3.7"
+groups = ["main"]
 files = [
     {file = "idutils-1.2.1-py2.py3-none-any.whl", hash = "sha256:908aabada07bb26e5e8f2d78ff222611b493cd721a05f1451f96d373a48f504d"},
     {file = "idutils-1.2.1.tar.gz", hash = "sha256:d09220edd893c3164837890f0d1da303111a16a231dd9dd331c64d3d6f2b52cb"},
@@ -2027,6 +2126,7 @@ version = "2.0.0"
 description = "brain-dead simple config-ini parsing"
 optional = false
 python-versions = ">=3.7"
+groups = ["dev"]
 files = [
     {file = "iniconfig-2.0.0-py3-none-any.whl", hash = "sha256:b6a85871a79d2e3b22d2d1b94ac2824226a63c6b741c88f7ae975f18b6778374"},
     {file = "iniconfig-2.0.0.tar.gz", hash = "sha256:2d91e135bf72d31a410b17c16da610a82cb55f6b0477d1a902134b24a455b8b3"},
@@ -2038,6 +2138,7 @@ version = "2.2.0"
 description = "Pythonic task execution"
 optional = false
 python-versions = ">=3.6"
+groups = ["main"]
 files = [
     {file = "invoke-2.2.0-py3-none-any.whl", hash = "sha256:6ea924cc53d4f78e3d98bc436b08069a03077e6f85ad1ddaa8a116d7dad15820"},
     {file = "invoke-2.2.0.tar.gz", hash = "sha256:ee6cbb101af1a859c7fe84f2a264c059020b0cb7fe3535f9424300ab568f6bd5"},
@@ -2049,6 +2150,7 @@ version = "0.13.13"
 description = "IPython-enabled pdb"
 optional = false
 python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*"
+groups = ["dev"]
 files = [
     {file = "ipdb-0.13.13-py3-none-any.whl", hash = "sha256:45529994741c4ab6d2388bfa5d7b725c2cf7fe9deffabdb8a6113aa5ed449ed4"},
     {file = "ipdb-0.13.13.tar.gz", hash = "sha256:e3ac6018ef05126d442af680aad863006ec19d02290561ac88b8b1c0b0cfc726"},
@@ -2064,6 +2166,7 @@ version = "8.27.0"
 description = "IPython: Productive Interactive Computing"
 optional = false
 python-versions = ">=3.10"
+groups = ["dev"]
 files = [
     {file = "ipython-8.27.0-py3-none-any.whl", hash = "sha256:f68b3cb8bde357a5d7adc9598d57e22a45dfbea19eb6b98286fa3b288c9cd55c"},
     {file = "ipython-8.27.0.tar.gz", hash = "sha256:0b99a2dc9f15fd68692e898e5568725c6d49c527d36a9fb5960ffbdeaa82ff7e"},
@@ -2083,7 +2186,7 @@ traitlets = ">=5.13.0"
 [package.extras]
 all = ["ipython[black,doc,kernel,matplotlib,nbconvert,nbformat,notebook,parallel,qtconsole]", "ipython[test,test-extra]"]
 black = ["black"]
-doc = ["docrepr", "exceptiongroup", "intersphinx-registry", "ipykernel", "ipython[test]", "matplotlib", "setuptools (>=18.5)", "sphinx (>=1.3)", "sphinx-rtd-theme", "sphinxcontrib-jquery", "tomli", "typing-extensions"]
+doc = ["docrepr", "exceptiongroup", "intersphinx-registry", "ipykernel", "ipython[test]", "matplotlib", "setuptools (>=18.5)", "sphinx (>=1.3)", "sphinx-rtd-theme", "sphinxcontrib-jquery", "tomli ; python_version < \"3.11\"", "typing-extensions"]
 kernel = ["ipykernel"]
 matplotlib = ["matplotlib"]
 nbconvert = ["nbconvert"]
@@ -2100,6 +2203,7 @@ version = "3.10.14"
 description = "Extract, clean, transform, hyphenate and metadata for ISBNs (International Standard Book Number)."
 optional = false
 python-versions = "*"
+groups = ["main"]
 files = [
     {file = "isbnlib-3.10.14-py2.py3-none-any.whl", hash = "sha256:f885b350fc8e600a919ed46e3b07253062cd604af69885455a25a299217b3fe2"},
     {file = "isbnlib-3.10.14.tar.gz", hash = "sha256:96f90864c77b01f55fa11e5bfca9fd909501d9842f3bc710d4eab85195d90539"},
@@ -2111,6 +2215,7 @@ version = "0.6.1"
 description = "An ISO 8601 date/time/duration parser and formatter"
 optional = false
 python-versions = "*"
+groups = ["main"]
 files = [
     {file = "isodate-0.6.1-py2.py3-none-any.whl", hash = "sha256:0751eece944162659049d35f4f549ed815792b38793f07cf73381c1c87cbed96"},
     {file = "isodate-0.6.1.tar.gz", hash = "sha256:48c5881de7e8b0a0d648cb024c8062dc84e7b840ed81e864c7614fd3c127bde9"},
@@ -2125,6 +2230,7 @@ version = "2.1.2"
 description = "Safely pass data to untrusted environments and back."
 optional = false
 python-versions = ">=3.7"
+groups = ["main"]
 files = [
     {file = "itsdangerous-2.1.2-py3-none-any.whl", hash = "sha256:2c2349112351b88699d8d4b6b075022c0808887cb7ad10069318a8b0bc88db44"},
     {file = "itsdangerous-2.1.2.tar.gz", hash = "sha256:5dbbc68b317e5e42f327f9021763545dc3fc3bfe22e6deb96aaf1fc38874156a"},
@@ -2136,6 +2242,7 @@ version = "0.19.1"
 description = "An autocompletion tool for Python that can be used for text editors."
 optional = false
 python-versions = ">=3.6"
+groups = ["dev"]
 files = [
     {file = "jedi-0.19.1-py2.py3-none-any.whl", hash = "sha256:e983c654fe5c02867aef4cdfce5a2fbb4a50adc0af145f70504238f18ef5e7e0"},
     {file = "jedi-0.19.1.tar.gz", hash = "sha256:cf0496f3651bc65d7174ac1b7d043eff454892c708a87d1b683e57b569927ffd"},
@@ -2155,6 +2262,7 @@ version = "3.1.4"
 description = "A very fast and expressive template engine."
 optional = false
 python-versions = ">=3.7"
+groups = ["main", "dev"]
 files = [
     {file = "jinja2-3.1.4-py3-none-any.whl", hash = "sha256:bc5dd2abb727a5319567b7a813e6a2e7318c39f4f487cfe6c89c6f9c7d25197d"},
     {file = "jinja2-3.1.4.tar.gz", hash = "sha256:4a3aee7acbbe7303aede8e9648d13b8bf88a429282aa6122a993f0ac800cb369"},
@@ -2172,6 +2280,7 @@ version = "1.0.1"
 description = "JSON Matching Expressions"
 optional = false
 python-versions = ">=3.7"
+groups = ["main", "addons"]
 files = [
     {file = "jmespath-1.0.1-py3-none-any.whl", hash = "sha256:02e2e4cc71b5bcab88332eebf907519190dd9e6e82107fa7f83b1003a6252980"},
     {file = "jmespath-1.0.1.tar.gz", hash = "sha256:90261b206d6defd58fdd5e85f478bf633a2901798906be2ad389150c5c60edbe"},
@@ -2183,6 +2292,7 @@ version = "4.21.1"
 description = "An implementation of JSON Schema validation for Python"
 optional = false
 python-versions = ">=3.8"
+groups = ["main"]
 files = [
     {file = "jsonschema-4.21.1-py3-none-any.whl", hash = "sha256:7996507afae316306f9e2290407761157c6f78002dcf7419acb99822143d1c6f"},
     {file = "jsonschema-4.21.1.tar.gz", hash = "sha256:85727c00279f5fa6bedbe6238d2aa6403bedd8b4864ab11207d07df3cc1b2ee5"},
@@ -2204,6 +2314,7 @@ version = "2023.12.1"
 description = "The JSON Schema meta-schemas and vocabularies, exposed as a Registry"
 optional = false
 python-versions = ">=3.8"
+groups = ["main"]
 files = [
     {file = "jsonschema_specifications-2023.12.1-py3-none-any.whl", hash = "sha256:87e4fdf3a94858b8a2ba2778d9ba57d8a9cafca7c7489c46ba0d30a8bc6a9c3c"},
     {file = "jsonschema_specifications-2023.12.1.tar.gz", hash = "sha256:48a76787b3e70f5ed53f1160d2b81f586e4ca6d1548c5de7085d1682674764cc"},
@@ -2218,6 +2329,7 @@ version = "5.3.5"
 description = "Messaging library for Python."
 optional = false
 python-versions = ">=3.8"
+groups = ["main"]
 files = [
     {file = "kombu-5.3.5-py3-none-any.whl", hash = "sha256:0eac1bbb464afe6fb0924b21bf79460416d25d8abc52546d4f16cad94f789488"},
     {file = "kombu-5.3.5.tar.gz", hash = "sha256:30e470f1a6b49c70dc6f6d13c3e4cc4e178aa6c469ceb6bcd55645385fc84b93"},
@@ -2232,7 +2344,7 @@ azureservicebus = ["azure-servicebus (>=7.10.0)"]
 azurestoragequeues = ["azure-identity (>=1.12.0)", "azure-storage-queue (>=12.6.0)"]
 confluentkafka = ["confluent-kafka (>=2.2.0)"]
 consul = ["python-consul2"]
-librabbitmq = ["librabbitmq (>=2.0.0)"]
+librabbitmq = ["librabbitmq (>=2.0.0) ; python_version < \"3.11\""]
 mongodb = ["pymongo (>=4.1.1)"]
 msgpack = ["msgpack"]
 pyro = ["pyro4"]
@@ -2240,7 +2352,7 @@ qpid = ["qpid-python (>=0.26)", "qpid-tools (>=0.26)"]
 redis = ["redis (>=4.5.2,!=4.5.5,<6.0.0)"]
 slmq = ["softlayer-messaging (>=1.0.3)"]
 sqlalchemy = ["sqlalchemy (>=1.4.48,<2.1)"]
-sqs = ["boto3 (>=1.26.143)", "pycurl (>=7.43.0.5)", "urllib3 (>=1.26.16)"]
+sqs = ["boto3 (>=1.26.143)", "pycurl (>=7.43.0.5) ; sys_platform != \"win32\" and platform_python_implementation == \"CPython\"", "urllib3 (>=1.26.16)"]
 yaml = ["PyYAML (>=3.10)"]
 zookeeper = ["kazoo (>=2.8.0)"]
 
@@ -2250,6 +2362,7 @@ version = "5.1.0"
 description = "Powerful and Pythonic XML processing library combining libxml2/libxslt with the ElementTree API."
 optional = false
 python-versions = ">=3.6"
+groups = ["main", "addons"]
 files = [
     {file = "lxml-5.1.0-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:704f5572ff473a5f897745abebc6df40f22d4133c1e0a1f124e4f2bd3330ff7e"},
     {file = "lxml-5.1.0-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:9d3c0f8567ffe7502d969c2c1b809892dc793b5d0665f602aad19895f8d508da"},
@@ -2343,6 +2456,7 @@ version = "3.0.21"
 description = "A python client for v3 of MailChimp API"
 optional = false
 python-versions = "*"
+groups = ["main"]
 files = [
     {file = "mailchimp3-3.0.21-py2.py3-none-any.whl", hash = "sha256:6eb335fcd915b3233285a0bdf6317fdfc412b4a638c102ae3a7a52019d3f0970"},
     {file = "mailchimp3-3.0.21.tar.gz", hash = "sha256:5e2930ece6144abb659d45e692e92135ab05c9027d3f5e807c0f66cfb374b9ad"},
@@ -2357,6 +2471,7 @@ version = "1.3.2"
 description = "A super-fast templating language that borrows the best ideas from the existing templating languages."
 optional = false
 python-versions = ">=3.8"
+groups = ["main"]
 files = [
     {file = "Mako-1.3.2-py3-none-any.whl", hash = "sha256:32a99d70754dfce237019d17ffe4a282d2d3351b9c476e90d8a60e63f133b80c"},
     {file = "Mako-1.3.2.tar.gz", hash = "sha256:2a0c8ad7f6274271b3bb7467dd37cf9cc6dab4bc19cb69a4ef10669402de698e"},
@@ -2376,6 +2491,7 @@ version = "3.5.2"
 description = "Python implementation of John Gruber's Markdown."
 optional = false
 python-versions = ">=3.8"
+groups = ["main"]
 files = [
     {file = "Markdown-3.5.2-py3-none-any.whl", hash = "sha256:d43323865d89fc0cb9b20c75fc8ad313af307cc087e84b657d9eec768eddeadd"},
     {file = "Markdown-3.5.2.tar.gz", hash = "sha256:e1ac7b3dc550ee80e602e71c1d168002f062e49f1b11e26a36264dafd4df2ef8"},
@@ -2391,6 +2507,7 @@ version = "1.0.0"
 description = "Markdown extension to support the <del> and <ins> tags"
 optional = false
 python-versions = "*"
+groups = ["main"]
 files = [
     {file = "markdown_del_ins-1.0.0-py3-none-any.whl", hash = "sha256:fc71237eaec2c5413d4ae330b1f691f38583b9f0ba35de7234bce86a7da955e7"},
     {file = "markdown_del_ins-1.0.0.tar.gz", hash = "sha256:bcce060d367ac867341e9652d210a500508a352aab55c56414e385e65f972913"},
@@ -2405,6 +2522,7 @@ version = "2.1.5"
 description = "Safely add untrusted strings to HTML/XML markup."
 optional = false
 python-versions = ">=3.7"
+groups = ["main", "dev"]
 files = [
     {file = "MarkupSafe-2.1.5-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:a17a92de5231666cfbe003f0e4b9b3a7ae3afb1ec2845aadc2bacc93ff85febc"},
     {file = "MarkupSafe-2.1.5-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:72b6be590cc35924b02c78ef34b467da4ba07e4e0f0454a2c5907f473fc50ce5"},
@@ -2474,6 +2592,7 @@ version = "0.1.7"
 description = "Inline Matplotlib backend for Jupyter"
 optional = false
 python-versions = ">=3.8"
+groups = ["dev"]
 files = [
     {file = "matplotlib_inline-0.1.7-py3-none-any.whl", hash = "sha256:df192d39a4ff8f21b1895d72e6a13f5fcc5099f00fa84384e0ea28c2cc0653ca"},
     {file = "matplotlib_inline-0.1.7.tar.gz", hash = "sha256:8423b23ec666be3d16e16b60bdd8ac4e86e840ebd1dd11a30b9f117f2fa0ab90"},
@@ -2488,6 +2607,7 @@ version = "0.7.0"
 description = "McCabe checker, plugin for flake8"
 optional = false
 python-versions = ">=3.6"
+groups = ["dev"]
 files = [
     {file = "mccabe-0.7.0-py2.py3-none-any.whl", hash = "sha256:6c2d30ab6be0e4a46919781807b4f0d834ebdd6c6e3dca0bda5a15f863427b6e"},
     {file = "mccabe-0.7.0.tar.gz", hash = "sha256:348e0240c33b60bbdf4e523192ef919f28cb2c3d7d5c7794f74009290f236325"},
@@ -2499,6 +2619,7 @@ version = "1.0.3"
 description = "A simple python decorator for defining properties that only run their fget function once"
 optional = false
 python-versions = "*"
+groups = ["addons"]
 files = [
     {file = "memoized-property-1.0.3.tar.gz", hash = "sha256:4be4d0209944b9b9b678dae9d7e312249fe2e6fb8bdc9bdaa1da4de324f0fcf5"},
 ]
@@ -2509,6 +2630,7 @@ version = "0.3.2"
 description = "Python SDK for the Mendeley API"
 optional = false
 python-versions = "*"
+groups = ["addons"]
 files = []
 develop = false
 
@@ -2531,6 +2653,7 @@ version = "1.1.0"
 description = "MessagePack serializer"
 optional = false
 python-versions = ">=3.8"
+groups = ["addons"]
 files = [
     {file = "msgpack-1.1.0-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:7ad442d527a7e358a469faf43fda45aaf4ac3249c8310a82f0ccff9164e5dccd"},
     {file = "msgpack-1.1.0-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:74bed8f63f8f14d75eec75cf3d04ad581da6b914001b474a5d3cd3372c8cc27d"},
@@ -2604,6 +2727,7 @@ version = "1.1.3"
 description = "A simple Python module for parsing human names into their individual components."
 optional = false
 python-versions = "*"
+groups = ["main"]
 files = [
     {file = "nameparser-1.1.3-py2.py3-none-any.whl", hash = "sha256:08ccda98681d59751c82052d52f185bc52f99d43e87d46b85c015a9096ecfa66"},
     {file = "nameparser-1.1.3.tar.gz", hash = "sha256:aa2400ad71ccf8070675b40311a257c934659f91854b154e1ba6c264761c049d"},
@@ -2615,6 +2739,7 @@ version = "9.7.1"
 description = "New Relic Python Agent"
 optional = false
 python-versions = ">=2.7,!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*,!=3.5.*,!=3.6.*"
+groups = ["release"]
 files = [
     {file = "newrelic-9.7.1-cp27-cp27m-manylinux1_x86_64.whl", hash = "sha256:1c1d24be69d5316af7be99d6c87686d900e708bc421ca55977cb021fd29de0bd"},
     {file = "newrelic-9.7.1-cp27-cp27m-manylinux2010_x86_64.whl", hash = "sha256:8dba147f13457bd22b4509bfa700ce12bfcb8294f8b9abd4c66d4e90f90cefc2"},
@@ -2656,6 +2781,7 @@ version = "1.9.1"
 description = "Node.js virtual environment builder"
 optional = false
 python-versions = "!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*,!=3.5.*,!=3.6.*,>=2.7"
+groups = ["dev"]
 files = [
     {file = "nodeenv-1.9.1-py2.py3-none-any.whl", hash = "sha256:ba11c9782d29c27c70ffbdda2d7415098754709be8a7056d79a737cd901155c9"},
     {file = "nodeenv-1.9.1.tar.gz", hash = "sha256:6ec12890a2dab7946721edbfbcd91f3319c6ccc9aec47be7c7e6b7011ee6645f"},
@@ -2667,6 +2793,7 @@ version = "1.0.0"
 description = "Detecting the n+1 queries problem in Python"
 optional = false
 python-versions = "*"
+groups = ["dev"]
 files = [
     {file = "nplusone-1.0.0-py2.py3-none-any.whl", hash = "sha256:96b1e6e29e6af3e71b67d0cc012a5ec8c97c6a2f5399f4ba41a2bbe0e253a9ac"},
     {file = "nplusone-1.0.0.tar.gz", hash = "sha256:1726c0a10c0aa7eabb04e24db2882ff97b6b7ee29d729a8d97dcbd12ef5a5651"},
@@ -2682,6 +2809,7 @@ version = "3.2.2"
 description = "A generic, spec-compliant, thorough implementation of the OAuth request-signing logic"
 optional = false
 python-versions = ">=3.6"
+groups = ["main", "addons"]
 files = [
     {file = "oauthlib-3.2.2-py3-none-any.whl", hash = "sha256:8139f29aac13e25d502680e9e19963e83f16838d48a0d71c287fe40e7067fbca"},
     {file = "oauthlib-3.2.2.tar.gz", hash = "sha256:9859c40929662bec5d64f34d01c99e093149682a3f38915dc0655d5a633dd918"},
@@ -2698,6 +2826,7 @@ version = "1.0.1"
 description = "Ordered Multivalue Dictionary"
 optional = false
 python-versions = "*"
+groups = ["main"]
 files = [
     {file = "orderedmultidict-1.0.1-py2.py3-none-any.whl", hash = "sha256:43c839a17ee3cdd62234c47deca1a8508a3f2ca1d0678a3bf791c87cf84adbf3"},
     {file = "orderedmultidict-1.0.1.tar.gz", hash = "sha256:04070bbb5e87291cc9bfa51df413677faf2141c73c61d2a5f7b26bea3cd882ad"},
@@ -2712,6 +2841,7 @@ version = "24.1"
 description = "Core utilities for Python packages"
 optional = false
 python-versions = ">=3.8"
+groups = ["main", "addons", "dev"]
 files = [
     {file = "packaging-24.1-py3-none-any.whl", hash = "sha256:5b8f2217dbdbd2f7f384c41c628544e6d52f2d0f53c6d0c3ea61aa5d1d7ff124"},
     {file = "packaging-24.1.tar.gz", hash = "sha256:026ed72c8ed3fcce5bf8950572258698927fd1dbda10a5e981cdf0ac37f4f002"},
@@ -2723,6 +2853,7 @@ version = "0.8.4"
 description = "A Python Parser"
 optional = false
 python-versions = ">=3.6"
+groups = ["dev"]
 files = [
     {file = "parso-0.8.4-py2.py3-none-any.whl", hash = "sha256:a418670a20291dacd2dddc80c377c5c3791378ee1e8d12bffc35420643d43f18"},
     {file = "parso-0.8.4.tar.gz", hash = "sha256:eb3a7b58240fb99099a345571deecc0f9540ea5f4dd2fe14c2a99d6b281ab92d"},
@@ -2738,6 +2869,8 @@ version = "4.9.0"
 description = "Pexpect allows easy control of interactive console applications."
 optional = false
 python-versions = "*"
+groups = ["dev"]
+markers = "sys_platform != \"win32\" and sys_platform != \"emscripten\""
 files = [
     {file = "pexpect-4.9.0-py2.py3-none-any.whl", hash = "sha256:7236d1e080e4936be2dc3e326cec0af72acf9212a7e1d060210e70a47e253523"},
     {file = "pexpect-4.9.0.tar.gz", hash = "sha256:ee7d41123f3c9911050ea2c2dac107568dc43b2d3b0c7557a33212c398ead30f"},
@@ -2752,6 +2885,7 @@ version = "10.2.0"
 description = "Python Imaging Library (Fork)"
 optional = false
 python-versions = ">=3.8"
+groups = ["main"]
 files = [
     {file = "pillow-10.2.0-cp310-cp310-macosx_10_10_x86_64.whl", hash = "sha256:7823bdd049099efa16e4246bdf15e5a13dbb18a51b68fa06d6c1d4d8b99a796e"},
     {file = "pillow-10.2.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:83b2021f2ade7d1ed556bc50a399127d7fb245e725aa0113ebd05cfe88aaf588"},
@@ -2828,7 +2962,7 @@ docs = ["furo", "olefile", "sphinx (>=2.4)", "sphinx-copybutton", "sphinx-inline
 fpx = ["olefile"]
 mic = ["olefile"]
 tests = ["check-manifest", "coverage", "defusedxml", "markdown2", "olefile", "packaging", "pyroma", "pytest", "pytest-cov", "pytest-timeout"]
-typing = ["typing-extensions"]
+typing = ["typing-extensions ; python_version < \"3.10\""]
 xmp = ["defusedxml"]
 
 [[package]]
@@ -2837,6 +2971,7 @@ version = "4.3.6"
 description = "A small Python package for determining appropriate platform-specific dirs, e.g. a `user data dir`."
 optional = false
 python-versions = ">=3.8"
+groups = ["dev"]
 files = [
     {file = "platformdirs-4.3.6-py3-none-any.whl", hash = "sha256:73e575e1408ab8103900836b97580d5307456908a03e92031bab39e4554cc3fb"},
     {file = "platformdirs-4.3.6.tar.gz", hash = "sha256:357fb2acbc885b0419afd3ce3ed34564c13c9b95c89360cd9563f73aa5e2b907"},
@@ -2853,6 +2988,7 @@ version = "1.5.0"
 description = "plugin and hook calling mechanisms for python"
 optional = false
 python-versions = ">=3.8"
+groups = ["dev"]
 files = [
     {file = "pluggy-1.5.0-py3-none-any.whl", hash = "sha256:44e1ad92c8ca002de6377e165f3e0f1be63266ab4d554740532335b9d75ea669"},
     {file = "pluggy-1.5.0.tar.gz", hash = "sha256:2cffa88e94fdc978c4c574f15f9e59b7f4201d439195c3715ca9e2486f1d0cf1"},
@@ -2868,6 +3004,7 @@ version = "3.11"
 description = "Python Lex & Yacc"
 optional = false
 python-versions = "*"
+groups = ["addons"]
 files = [
     {file = "ply-3.11-py2.py3-none-any.whl", hash = "sha256:096f9b8350b65ebd2fd1346b12452efe5b9607f7482813ffca50c22722a807ce"},
     {file = "ply-3.11.tar.gz", hash = "sha256:00c7c1aaa88358b9c765b6d3000c6eec0ba42abca5351b095321aef446081da3"},
@@ -2879,6 +3016,7 @@ version = "3.7.1"
 description = "A framework for managing and maintaining multi-language pre-commit hooks."
 optional = false
 python-versions = ">=3.9"
+groups = ["dev"]
 files = [
     {file = "pre_commit-3.7.1-py2.py3-none-any.whl", hash = "sha256:fae36fd1d7ad7d6a5a1c0b0d5adb2ed1a3bda5a21bf6c3e5372073d7a11cd4c5"},
     {file = "pre_commit-3.7.1.tar.gz", hash = "sha256:8ca3ad567bc78a4972a3f1a477e94a79d4597e8140a6e0b651c5e33899c3654a"},
@@ -2897,6 +3035,7 @@ version = "3.0.47"
 description = "Library for building powerful interactive command lines in Python"
 optional = false
 python-versions = ">=3.7.0"
+groups = ["main", "dev"]
 files = [
     {file = "prompt_toolkit-3.0.47-py3-none-any.whl", hash = "sha256:0d7bfa67001d5e39d02c224b663abc33687405033a8c422d0d675a5a13361d10"},
     {file = "prompt_toolkit-3.0.47.tar.gz", hash = "sha256:1e1b29cb58080b1e69f207c893a1a7bf16d127a5c30c9d17a25a5d77792e5360"},
@@ -2911,6 +3050,7 @@ version = "1.24.0"
 description = "Beautiful, Pythonic protocol buffers."
 optional = false
 python-versions = ">=3.7"
+groups = ["main"]
 files = [
     {file = "proto-plus-1.24.0.tar.gz", hash = "sha256:30b72a5ecafe4406b0d339db35b56c4059064e69227b8c3bda7462397f966445"},
     {file = "proto_plus-1.24.0-py3-none-any.whl", hash = "sha256:402576830425e5f6ce4c2a6702400ac79897dab0b4343821aa5188b0fab81a12"},
@@ -2928,6 +3068,7 @@ version = "5.28.2"
 description = ""
 optional = false
 python-versions = ">=3.8"
+groups = ["main"]
 files = [
     {file = "protobuf-5.28.2-cp310-abi3-win32.whl", hash = "sha256:eeea10f3dc0ac7e6b4933d32db20662902b4ab81bf28df12218aa389e9c2102d"},
     {file = "protobuf-5.28.2-cp310-abi3-win_amd64.whl", hash = "sha256:2c69461a7fcc8e24be697624c09a839976d82ae75062b11a0972e41fd2cd9132"},
@@ -2948,6 +3089,7 @@ version = "2.9.9"
 description = "psycopg2 - Python-PostgreSQL Database Adapter"
 optional = false
 python-versions = ">=3.7"
+groups = ["main"]
 files = [
     {file = "psycopg2-2.9.9-cp310-cp310-win32.whl", hash = "sha256:38a8dcc6856f569068b47de286b472b7c473ac7977243593a288ebce0dc89516"},
     {file = "psycopg2-2.9.9-cp310-cp310-win_amd64.whl", hash = "sha256:426f9f29bde126913a20a96ff8ce7d73fd8a216cfb323b1f04da402d452853c3"},
@@ -2970,6 +3112,8 @@ version = "0.7.0"
 description = "Run a subprocess in a pseudo terminal"
 optional = false
 python-versions = "*"
+groups = ["dev"]
+markers = "sys_platform != \"win32\" and sys_platform != \"emscripten\""
 files = [
     {file = "ptyprocess-0.7.0-py2.py3-none-any.whl", hash = "sha256:4b41f3967fce3af57cc7e94b888626c18bf37a083e3651ca8feeb66d492fef35"},
     {file = "ptyprocess-0.7.0.tar.gz", hash = "sha256:5c5d0a3b48ceee0b48485e0c26037c0acd7d29765ca3fbb5cb3831d347423220"},
@@ -2981,6 +3125,7 @@ version = "0.2.3"
 description = "Safely evaluate AST nodes without side effects"
 optional = false
 python-versions = "*"
+groups = ["dev"]
 files = [
     {file = "pure_eval-0.2.3-py3-none-any.whl", hash = "sha256:1db8e35b67b3d218d818ae653e27f06c3aa420901fa7b081ca98cbedc874e0d0"},
     {file = "pure_eval-0.2.3.tar.gz", hash = "sha256:5f4e983f40564c576c7c8635ae88db5956bb2229d7e9237d03b3c0b0190eaf42"},
@@ -2995,6 +3140,7 @@ version = "0.6.1"
 description = "Pure-Python implementation of ASN.1 types and DER/BER/CER codecs (X.208)"
 optional = false
 python-versions = ">=3.8"
+groups = ["main"]
 files = [
     {file = "pyasn1-0.6.1-py3-none-any.whl", hash = "sha256:0d632f46f2ba09143da3a8afe9e33fb6f92fa2320ab7e886e2d0f7672af84629"},
     {file = "pyasn1-0.6.1.tar.gz", hash = "sha256:6f580d2bdd84365380830acf45550f2511469f673cb4a5ae3857a3170128b034"},
@@ -3006,6 +3152,7 @@ version = "0.4.1"
 description = "A collection of ASN.1-based protocols modules"
 optional = false
 python-versions = ">=3.8"
+groups = ["main"]
 files = [
     {file = "pyasn1_modules-0.4.1-py3-none-any.whl", hash = "sha256:49bfa96b45a292b711e986f222502c1c9a5e1f4e568fc30e2574a6c7d07838fd"},
     {file = "pyasn1_modules-0.4.1.tar.gz", hash = "sha256:c28e2dbf9c06ad61c71a075c7e0f9fd0f1b0bb2d2ad4377f240d33ac2ab60a7c"},
@@ -3020,6 +3167,7 @@ version = "2.11.1"
 description = "Python style guide checker"
 optional = false
 python-versions = ">=3.8"
+groups = ["dev"]
 files = [
     {file = "pycodestyle-2.11.1-py2.py3-none-any.whl", hash = "sha256:44fe31000b2d866f2e41841b18528a505fbd7fef9017b04eff4e2648a0fadc67"},
     {file = "pycodestyle-2.11.1.tar.gz", hash = "sha256:41ba0e7afc9752dfb53ced5489e89f8186be00e599e712660695b7a75ff2663f"},
@@ -3031,6 +3179,8 @@ version = "2.22"
 description = "C parser in Python"
 optional = false
 python-versions = ">=3.8"
+groups = ["main", "addons"]
+markers = "platform_python_implementation != \"PyPy\""
 files = [
     {file = "pycparser-2.22-py3-none-any.whl", hash = "sha256:c3702b6d3dd8c7abc1afa565d7e63d53a1d0bd86cdc24edd75470f4de499cfcc"},
     {file = "pycparser-2.22.tar.gz", hash = "sha256:491c8be9c040f5390f5bf44a5b07752bd07f56edf992381b05c701439eec10f6"},
@@ -3042,6 +3192,7 @@ version = "3.0.3"
 description = "PyDev.Debugger (used in PyDev, PyCharm and VSCode Python)"
 optional = false
 python-versions = "*"
+groups = ["dev"]
 files = [
     {file = "pydevd-3.0.3-cp310-cp310-macosx_11_0_x86_64.whl", hash = "sha256:4afe97661564264144ec8183f914d0eb45879740bbf252b562534998b28619d7"},
     {file = "pydevd-3.0.3-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:156c2fdf6b9742221689b0ac168a6ee2b6c9ec29d45c8170985352bc04f9be23"},
@@ -3082,6 +3233,7 @@ version = "3.2.0"
 description = "passive checker of Python programs"
 optional = false
 python-versions = ">=3.8"
+groups = ["dev"]
 files = [
     {file = "pyflakes-3.2.0-py2.py3-none-any.whl", hash = "sha256:84b5be138a2dfbb40689ca07e2152deb896a65c3a3e24c251c5c62489568074a"},
     {file = "pyflakes-3.2.0.tar.gz", hash = "sha256:1c61603ff154621fb2a9172037d84dca3500def8c8b630657d1701f026f8af3f"},
@@ -3093,6 +3245,7 @@ version = "2.18.0"
 description = "Pygments is a syntax highlighting package written in Python."
 optional = false
 python-versions = ">=3.8"
+groups = ["dev"]
 files = [
     {file = "pygments-2.18.0-py3-none-any.whl", hash = "sha256:b8e6aca0523f3ab76fee51799c488e38782ac06eafcf95e7ba832985c8e7b13a"},
     {file = "pygments-2.18.0.tar.gz", hash = "sha256:786ff802f32e91311bff3889f6e9a86e81505fe99f2735bb6d60ae0c5004f199"},
@@ -3107,6 +3260,7 @@ version = "1.0.0"
 description = "JSON Web Encryption implementation in Python"
 optional = false
 python-versions = "*"
+groups = ["main"]
 files = [
     {file = "PyJWE-1.0.0.tar.gz", hash = "sha256:e3b3de7be4fcc260e5f1a47ead9c9a9211d8ce98f9e1d88d9a7225198aa9ce47"},
 ]
@@ -3120,6 +3274,7 @@ version = "2.8.0"
 description = "JSON Web Token implementation in Python"
 optional = false
 python-versions = ">=3.7"
+groups = ["main", "addons"]
 files = [
     {file = "PyJWT-2.8.0-py3-none-any.whl", hash = "sha256:59127c392cc44c2da5bb3192169a91f429924e17aff6534d70fdc02ab3e04320"},
     {file = "PyJWT-2.8.0.tar.gz", hash = "sha256:57e28d156e3d5c10088e0c68abb90bfac3df82b40a71bd0daa20c65ccd5c23de"},
@@ -3140,6 +3295,7 @@ version = "3.13.0"
 description = "Python driver for MongoDB <http://www.mongodb.org>"
 optional = false
 python-versions = "*"
+groups = ["main"]
 files = [
     {file = "pymongo-3.13.0-cp27-cp27m-macosx_10_14_intel.whl", hash = "sha256:3ad3a3df830f7df7e0856c2bdb54d19f5bf188bd7420985e18643b8e4d2a075f"},
     {file = "pymongo-3.13.0-cp27-cp27m-manylinux1_i686.whl", hash = "sha256:b96e0e9d2d48948240b510bac81614458fc10adcd3a93240c2fd96448b4efd35"},
@@ -3274,6 +3430,7 @@ version = "0.6"
 description = "Python client library for ownCloud"
 optional = false
 python-versions = "*"
+groups = ["addons"]
 files = [
     {file = "pyocclient-0.6.tar.gz", hash = "sha256:a33ddcbbd2ec22d9bc7d76b71dd77896c557221153d1428759780b5fb8fe8fa3"},
 ]
@@ -3288,6 +3445,7 @@ version = "24.2.1"
 description = "Python wrapper module around the OpenSSL library"
 optional = false
 python-versions = ">=3.7"
+groups = ["main"]
 files = [
     {file = "pyOpenSSL-24.2.1-py3-none-any.whl", hash = "sha256:967d5719b12b243588573f39b0c677637145c7a1ffedcd495a487e58177fbb8d"},
     {file = "pyopenssl-24.2.1.tar.gz", hash = "sha256:4247f0dbe3748d560dcbb2ff3ea01af0f9a1a001ef5f7c4c647956ed8cbf0e95"},
@@ -3306,6 +3464,7 @@ version = "2.9.0"
 description = "Python One Time Password Library"
 optional = false
 python-versions = ">=3.7"
+groups = ["addons"]
 files = [
     {file = "pyotp-2.9.0-py3-none-any.whl", hash = "sha256:81c2e5865b8ac55e825b0358e496e1d9387c811e85bb40e71a3b29b288963612"},
     {file = "pyotp-2.9.0.tar.gz", hash = "sha256:346b6642e0dbdde3b4ff5a930b664ca82abfa116356ed48cc42c7d6590d36f63"},
@@ -3320,6 +3479,7 @@ version = "3.1.4"
 description = "pyparsing module - Classes and methods to define and execute parsing grammars"
 optional = false
 python-versions = ">=3.6.8"
+groups = ["main", "addons"]
 files = [
     {file = "pyparsing-3.1.4-py3-none-any.whl", hash = "sha256:a6a7ee4235a3f944aa1fa2249307708f893fe5717dc603503c6c7969c070fb7c"},
     {file = "pyparsing-3.1.4.tar.gz", hash = "sha256:f86ec8d1a83f11977c9a6ea7598e8c27fc5cddfa5b07ea2241edbbde1d7bc032"},
@@ -3334,6 +3494,7 @@ version = "7.4.4"
 description = "pytest: simple powerful testing with Python"
 optional = false
 python-versions = ">=3.7"
+groups = ["dev"]
 files = [
     {file = "pytest-7.4.4-py3-none-any.whl", hash = "sha256:b090cdf5ed60bf4c45261be03239c2c1c22df034fbffe691abe93cd80cea01d8"},
     {file = "pytest-7.4.4.tar.gz", hash = "sha256:2cf0005922c6ace4a3e2ec8b4080eb0d9753fdc93107415332f50ce9e7994280"},
@@ -3354,6 +3515,7 @@ version = "0.23.5"
 description = "Pytest support for asyncio"
 optional = false
 python-versions = ">=3.8"
+groups = ["dev"]
 files = [
     {file = "pytest-asyncio-0.23.5.tar.gz", hash = "sha256:3a048872a9c4ba14c3e90cc1aa20cbc2def7d01c7c8db3777ec281ba9c057675"},
     {file = "pytest_asyncio-0.23.5-py3-none-any.whl", hash = "sha256:4e7093259ba018d58ede7d5315131d21923a60f8a6e9ee266ce1589685c89eac"},
@@ -3372,6 +3534,7 @@ version = "4.8.0"
 description = "A Django plugin for pytest."
 optional = false
 python-versions = ">=3.8"
+groups = ["dev"]
 files = [
     {file = "pytest-django-4.8.0.tar.gz", hash = "sha256:5d054fe011c56f3b10f978f41a8efb2e5adfc7e680ef36fb571ada1f24779d90"},
     {file = "pytest_django-4.8.0-py3-none-any.whl", hash = "sha256:ca1ddd1e0e4c227cf9e3e40a6afc6d106b3e70868fd2ac5798a22501271cd0c7"},
@@ -3390,6 +3553,7 @@ version = "4.1.1"
 description = "pytest plugin for generating HTML reports"
 optional = false
 python-versions = ">=3.8"
+groups = ["dev"]
 files = [
     {file = "pytest_html-4.1.1-py3-none-any.whl", hash = "sha256:c8152cea03bd4e9bee6d525573b67bbc6622967b72b9628dda0ea3e2a0b5dd71"},
     {file = "pytest_html-4.1.1.tar.gz", hash = "sha256:70a01e8ae5800f4a074b56a4cb1025c8f4f9b038bba5fe31e3c98eb996686f07"},
@@ -3410,6 +3574,7 @@ version = "3.1.1"
 description = "pytest plugin for test session metadata"
 optional = false
 python-versions = ">=3.8"
+groups = ["dev"]
 files = [
     {file = "pytest_metadata-3.1.1-py3-none-any.whl", hash = "sha256:c8e0844db684ee1c798cfa38908d20d67d0463ecb6137c72e91f418558dd5f4b"},
     {file = "pytest_metadata-3.1.1.tar.gz", hash = "sha256:d2a29b0355fbc03f168aa96d41ff88b1a3b44a3b02acbe491801c98a048017c8"},
@@ -3427,6 +3592,7 @@ version = "0.7.0"
 description = "Pytest Plugin to disable socket calls during tests"
 optional = false
 python-versions = ">=3.8,<4.0"
+groups = ["dev"]
 files = [
     {file = "pytest_socket-0.7.0-py3-none-any.whl", hash = "sha256:7e0f4642177d55d317bbd58fc68c6bd9048d6eadb2d46a89307fa9221336ce45"},
     {file = "pytest_socket-0.7.0.tar.gz", hash = "sha256:71ab048cbbcb085c15a4423b73b619a8b35d6a307f46f78ea46be51b1b7e11b3"},
@@ -3441,6 +3607,7 @@ version = "2.1.0"
 description = "selects tests affected by changed files and methods"
 optional = false
 python-versions = ">=3.8"
+groups = ["dev"]
 files = [
     {file = "pytest-testmon-2.1.0.tar.gz", hash = "sha256:b3d20a3ceb099e36727217096a7b3fc662877bd8b0768d2439983924c2a807a6"},
     {file = "pytest_testmon-2.1.0-py3-none-any.whl", hash = "sha256:a9848735b53381bf97a421c5c40828f0e1973d8a30748d345edc2108315cbe8d"},
@@ -3456,6 +3623,7 @@ version = "3.5.0"
 description = "pytest xdist plugin for distributed testing, most importantly across multiple CPUs"
 optional = false
 python-versions = ">=3.7"
+groups = ["dev"]
 files = [
     {file = "pytest-xdist-3.5.0.tar.gz", hash = "sha256:cbb36f3d67e0c478baa57fa4edc8843887e0f6cfc42d677530a36d7472b32d8a"},
     {file = "pytest_xdist-3.5.0-py3-none-any.whl", hash = "sha256:d075629c7e00b611df89f490a5063944bee7a4362a5ff11c7cc7824a03dfce24"},
@@ -3476,6 +3644,7 @@ version = "2.9.3"
 description = "Python interface to coveralls.io API\n"
 optional = false
 python-versions = "*"
+groups = ["dev"]
 files = [
     {file = "python-coveralls-2.9.3.tar.gz", hash = "sha256:bfaf7811e7dc5628e83b6b162962a4e2485dbff184b30e49f380374ed1bcee55"},
     {file = "python_coveralls-2.9.3-py2.py3-none-any.whl", hash = "sha256:fb0ff49bb1551dac10b06bd55e9790287d898a0f1e2c959802235cae08dd0bff"},
@@ -3493,6 +3662,7 @@ version = "3.2.0"
 description = "Python Crontab API"
 optional = false
 python-versions = "*"
+groups = ["main"]
 files = [
     {file = "python_crontab-3.2.0-py3-none-any.whl", hash = "sha256:82cb9b6a312d41ff66fd3caf3eed7115c28c195bfb50711bc2b4b9592feb9fe5"},
     {file = "python_crontab-3.2.0.tar.gz", hash = "sha256:40067d1dd39ade3460b2ad8557c7651514cd3851deffff61c5c60e1227c5c36b"},
@@ -3511,6 +3681,7 @@ version = "2.9.0"
 description = "Extensions to the standard Python datetime module"
 optional = false
 python-versions = "!=3.0.*,!=3.1.*,!=3.2.*,>=2.7"
+groups = ["main", "addons", "dev"]
 files = [
     {file = "python-dateutil-2.9.0.tar.gz", hash = "sha256:78e73e19c63f5b20ffa567001531680d939dc042bf7850431877645523c66709"},
     {file = "python_dateutil-2.9.0-py2.py3-none-any.whl", hash = "sha256:cbf2f1da5e6083ac2fbfd4da39a25f34312230110440f424a14c7558bb85d82e"},
@@ -3525,6 +3696,7 @@ version = "4.4.0"
 description = "A python wrapper for the GitLab API"
 optional = false
 python-versions = ">=3.8.0"
+groups = ["addons"]
 files = [
     {file = "python-gitlab-4.4.0.tar.gz", hash = "sha256:1d117bf7b433ae8255e5d74e72c660978f50ee85eb62248c9fb52ef43c3e3814"},
     {file = "python_gitlab-4.4.0-py3-none-any.whl", hash = "sha256:cdad39d016f59664cdaad0f878f194c79cb4357630776caa9a92c1da25c8d986"},
@@ -3544,6 +3716,7 @@ version = "3.3.7"
 description = "HTTP REST client, simplified for Python"
 optional = false
 python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*"
+groups = ["main"]
 files = [
     {file = "python_http_client-3.3.7-py3-none-any.whl", hash = "sha256:ad371d2bbedc6ea15c26179c6222a78bc9308d272435ddf1d5c84f068f249a36"},
     {file = "python_http_client-3.3.7.tar.gz", hash = "sha256:bf841ee45262747e00dec7ee9971dfb8c7d83083f5713596488d67739170cea0"},
@@ -3555,6 +3728,7 @@ version = "2024.1"
 description = "World timezone definitions, modern and historical"
 optional = false
 python-versions = "*"
+groups = ["main", "addons"]
 files = [
     {file = "pytz-2024.1-py2.py3-none-any.whl", hash = "sha256:328171f4e3623139da4983451950b28e95ac706e13f3f2630a879749e7a8b319"},
     {file = "pytz-2024.1.tar.gz", hash = "sha256:2a29735ea9c18baf14b448846bde5a48030ed267578472d8955cd0e7443a9812"},
@@ -3566,6 +3740,7 @@ version = "6.0.1"
 description = "YAML parser and emitter for Python"
 optional = false
 python-versions = ">=3.6"
+groups = ["main", "dev"]
 files = [
     {file = "PyYAML-6.0.1-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:d858aa552c999bc8a8d57426ed01e40bef403cd8ccdd0fc5f6f04a00414cac2a"},
     {file = "PyYAML-6.0.1-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:fd66fc5d0da6d9815ba2cebeb4205f95818ff4b79c3ebe268e75d961704af52f"},
@@ -3626,6 +3801,7 @@ version = "1.5.18"
 description = "Python wrapper for the Zotero API"
 optional = false
 python-versions = ">=3.8"
+groups = ["addons"]
 files = [
     {file = "pyzotero-1.5.18-py3-none-any.whl", hash = "sha256:c5d461022b00419ea822bad7c9886a6a2770aad49bff607f80e64e81b68212b3"},
     {file = "pyzotero-1.5.18.tar.gz", hash = "sha256:42cecd858703bab49ee92b68ccd1b1d1cbbf85d3f9c889963f352badf8f1a42f"},
@@ -3646,6 +3822,7 @@ version = "7.0.0"
 description = "RDFLib is a Python library for working with RDF, a simple yet powerful language for representing information."
 optional = false
 python-versions = ">=3.8.1,<4.0.0"
+groups = ["main"]
 files = [
     {file = "rdflib-7.0.0-py3-none-any.whl", hash = "sha256:0438920912a642c866a513de6fe8a0001bd86ef975057d6962c79ce4771687cd"},
     {file = "rdflib-7.0.0.tar.gz", hash = "sha256:9995eb8569428059b8c1affd26b25eac510d64f5043d9ce8c84e0d0036e995ae"},
@@ -3667,6 +3844,7 @@ version = "5.0.8"
 description = "Python client for Redis database and key-value store"
 optional = false
 python-versions = ">=3.7"
+groups = ["main"]
 files = [
     {file = "redis-5.0.8-py3-none-any.whl", hash = "sha256:56134ee08ea909106090934adc36f65c9bcbbaecea5b21ba704ba6fb561f8eb4"},
     {file = "redis-5.0.8.tar.gz", hash = "sha256:0c5b10d387568dfe0698c6fad6615750c24170e548ca2deac10c649d463e9870"},
@@ -3682,6 +3860,7 @@ version = "0.35.1"
 description = "JSON Referencing + Python"
 optional = false
 python-versions = ">=3.8"
+groups = ["main"]
 files = [
     {file = "referencing-0.35.1-py3-none-any.whl", hash = "sha256:eda6d3234d62814d1c64e305c1331c9a3a6132da475ab6382eaa997b21ee75de"},
     {file = "referencing-0.35.1.tar.gz", hash = "sha256:25b42124a6c8b632a425174f24087783efb348a6f1e0008e63cd4466fedf703c"},
@@ -3697,6 +3876,7 @@ version = "2.31.0"
 description = "Python HTTP for Humans."
 optional = false
 python-versions = ">=3.7"
+groups = ["main", "addons", "dev"]
 files = [
     {file = "requests-2.31.0-py3-none-any.whl", hash = "sha256:58cd2187c01e70e6e26505bca751777aa9f2ee0b7f4300988b709f44e013003f"},
     {file = "requests-2.31.0.tar.gz", hash = "sha256:942c5a758f98d790eaed1a29cb6eefc7ffb0d1cf7af05c3d2791656dbd6ad1e1"},
@@ -3718,6 +3898,7 @@ version = "1.3.1"
 description = "OAuthlib authentication support for Requests."
 optional = false
 python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*"
+groups = ["main", "addons"]
 files = [
     {file = "requests-oauthlib-1.3.1.tar.gz", hash = "sha256:75beac4a47881eeb94d5ea5d6ad31ef88856affe2332b9aafb52c6452ccf0d7a"},
     {file = "requests_oauthlib-1.3.1-py2.py3-none-any.whl", hash = "sha256:2577c501a2fb8d05a304c09d090d6e47c306fef15809d102b327cf8364bddab5"},
@@ -3736,6 +3917,7 @@ version = "1.0.0"
 description = "A utility belt for advanced users of python-requests"
 optional = false
 python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*"
+groups = ["addons"]
 files = [
     {file = "requests-toolbelt-1.0.0.tar.gz", hash = "sha256:7681a0a3d047012b5bdc0ee37d7f8f07ebe76ab08caeccfc3921ce23c88d5bc6"},
     {file = "requests_toolbelt-1.0.0-py2.py3-none-any.whl", hash = "sha256:cccfdd665f0a24fcf4726e690f65639d272bb0637b9b92dfd91a5568ccf6bd06"},
@@ -3750,6 +3932,7 @@ version = "0.25.0"
 description = "A utility library for mocking out the `requests` Python library."
 optional = false
 python-versions = ">=3.8"
+groups = ["dev"]
 files = [
     {file = "responses-0.25.0-py3-none-any.whl", hash = "sha256:2f0b9c2b6437db4b528619a77e5d565e4ec2a9532162ac1a131a83529db7be1a"},
     {file = "responses-0.25.0.tar.gz", hash = "sha256:01ae6a02b4f34e39bffceb0fc6786b67a25eae919c6368d05eabc8d9576c2a66"},
@@ -3761,7 +3944,7 @@ requests = ">=2.30.0,<3.0"
 urllib3 = ">=1.25.10,<3.0"
 
 [package.extras]
-tests = ["coverage (>=6.0.0)", "flake8", "mypy", "pytest (>=7.0.0)", "pytest-asyncio", "pytest-cov", "pytest-httpserver", "tomli", "tomli-w", "types-PyYAML", "types-requests"]
+tests = ["coverage (>=6.0.0)", "flake8", "mypy", "pytest (>=7.0.0)", "pytest-asyncio", "pytest-cov", "pytest-httpserver", "tomli ; python_version < \"3.11\"", "tomli-w", "types-PyYAML", "types-requests"]
 
 [[package]]
 name = "rpds-py"
@@ -3769,6 +3952,7 @@ version = "0.20.0"
 description = "Python bindings to Rust's persistent data structures (rpds)"
 optional = false
 python-versions = ">=3.8"
+groups = ["main"]
 files = [
     {file = "rpds_py-0.20.0-cp310-cp310-macosx_10_12_x86_64.whl", hash = "sha256:3ad0fda1635f8439cde85c700f964b23ed5fc2d28016b32b9ee5fe30da5c84e2"},
     {file = "rpds_py-0.20.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:9bb4a0d90fdb03437c109a17eade42dfbf6190408f29b2744114d11586611d6f"},
@@ -3881,6 +4065,7 @@ version = "4.9"
 description = "Pure-Python RSA implementation"
 optional = false
 python-versions = ">=3.6,<4"
+groups = ["main"]
 files = [
     {file = "rsa-4.9-py3-none-any.whl", hash = "sha256:90260d9058e514786967344d0ef75fa8727eed8a7d2e43ce9f4bcf1b536174f7"},
     {file = "rsa-4.9.tar.gz", hash = "sha256:e38464a49c6c85d7f1351b0126661487a7e0a14a50f1675ec50eb34d4f20ef21"},
@@ -3895,6 +4080,7 @@ version = "0.10.2"
 description = "An Amazon S3 Transfer Manager"
 optional = false
 python-versions = ">=3.8"
+groups = ["main", "addons"]
 files = [
     {file = "s3transfer-0.10.2-py3-none-any.whl", hash = "sha256:eca1c20de70a39daee580aef4986996620f365c4e0fda6a86100231d62f1bf69"},
     {file = "s3transfer-0.10.2.tar.gz", hash = "sha256:0711534e9356d3cc692fdde846b4a1e4b0cb6519971860796e6bc4c7aea00ef6"},
@@ -3912,6 +4098,7 @@ version = "0.7.4"
 description = "Simple data validation library"
 optional = false
 python-versions = "*"
+groups = ["dev"]
 files = [
     {file = "schema-0.7.4-py2.py3-none-any.whl", hash = "sha256:cf97e4cd27e203ab6bb35968532de1ed8991bce542a646f0ff1d643629a4945d"},
     {file = "schema-0.7.4.tar.gz", hash = "sha256:fbb6a52eb2d9facf292f233adcc6008cffd94343c63ccac9a1cb1f3e6de1db17"},
@@ -3926,6 +4113,7 @@ version = "6.11.0"
 description = "Twilio SendGrid library for Python"
 optional = false
 python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*"
+groups = ["main"]
 files = [
     {file = "sendgrid-6.11.0-py3-none-any.whl", hash = "sha256:43ecf5bb742ea5850c7cfe68f5e7d9948772352306d4e83e119899959538b884"},
     {file = "sendgrid-6.11.0.tar.gz", hash = "sha256:71424b2a97f5a034121ea3b2666c653ba0ed315982f0d57b7851c0c9503dc5ab"},
@@ -3941,6 +4129,7 @@ version = "2.2.0"
 description = "Python client for Sentry (https://sentry.io)"
 optional = false
 python-versions = ">=3.6"
+groups = ["main"]
 files = [
     {file = "sentry_sdk-2.2.0-py2.py3-none-any.whl", hash = "sha256:674f58da37835ea7447fe0e34c57b4a4277fad558b0a7cb4a6c83bcb263086be"},
     {file = "sentry_sdk-2.2.0.tar.gz", hash = "sha256:70eca103cf4c6302365a9d7cf522e7ed7720828910eb23d43ada8e50d1ecda9d"},
@@ -3996,6 +4185,7 @@ version = "24.1.0"
 description = "Service identity verification for pyOpenSSL & cryptography."
 optional = false
 python-versions = ">=3.8"
+groups = ["main"]
 files = [
     {file = "service_identity-24.1.0-py3-none-any.whl", hash = "sha256:a28caf8130c8a5c1c7a6f5293faaf239bbfb7751e4862436920ee6f2616f568a"},
     {file = "service_identity-24.1.0.tar.gz", hash = "sha256:6829c9d62fb832c2e1c435629b0a8c476e1929881f28bee4d20bc24161009221"},
@@ -4020,19 +4210,20 @@ version = "75.1.0"
 description = "Easily download, build, install, upgrade, and uninstall Python packages"
 optional = false
 python-versions = ">=3.8"
+groups = ["main"]
 files = [
     {file = "setuptools-75.1.0-py3-none-any.whl", hash = "sha256:35ab7fd3bcd95e6b7fd704e4a1539513edad446c097797f2985e0e4b960772f2"},
     {file = "setuptools-75.1.0.tar.gz", hash = "sha256:d59a21b17a275fb872a9c3dae73963160ae079f1049ed956880cd7c09b120538"},
 ]
 
 [package.extras]
-check = ["pytest-checkdocs (>=2.4)", "pytest-ruff (>=0.2.1)", "ruff (>=0.5.2)"]
-core = ["importlib-metadata (>=6)", "importlib-resources (>=5.10.2)", "jaraco.collections", "jaraco.functools", "jaraco.text (>=3.7)", "more-itertools", "more-itertools (>=8.8)", "packaging", "packaging (>=24)", "platformdirs (>=2.6.2)", "tomli (>=2.0.1)", "wheel (>=0.43.0)"]
+check = ["pytest-checkdocs (>=2.4)", "pytest-ruff (>=0.2.1) ; sys_platform != \"cygwin\"", "ruff (>=0.5.2) ; sys_platform != \"cygwin\""]
+core = ["importlib-metadata (>=6) ; python_version < \"3.10\"", "importlib-resources (>=5.10.2) ; python_version < \"3.9\"", "jaraco.collections", "jaraco.functools", "jaraco.text (>=3.7)", "more-itertools", "more-itertools (>=8.8)", "packaging", "packaging (>=24)", "platformdirs (>=2.6.2)", "tomli (>=2.0.1) ; python_version < \"3.11\"", "wheel (>=0.43.0)"]
 cover = ["pytest-cov"]
 doc = ["furo", "jaraco.packaging (>=9.3)", "jaraco.tidelift (>=1.4)", "pygments-github-lexers (==0.0.5)", "pyproject-hooks (!=1.1)", "rst.linker (>=1.9)", "sphinx (>=3.5)", "sphinx-favicon", "sphinx-inline-tabs", "sphinx-lint", "sphinx-notfound-page (>=1,<2)", "sphinx-reredirects", "sphinxcontrib-towncrier", "towncrier (<24.7)"]
 enabler = ["pytest-enabler (>=2.2)"]
-test = ["build[virtualenv] (>=1.0.3)", "filelock (>=3.4.0)", "ini2toml[lite] (>=0.14)", "jaraco.develop (>=7.21)", "jaraco.envs (>=2.2)", "jaraco.path (>=3.2.0)", "jaraco.test", "packaging (>=23.2)", "pip (>=19.1)", "pyproject-hooks (!=1.1)", "pytest (>=6,!=8.1.*)", "pytest-home (>=0.5)", "pytest-perf", "pytest-subprocess", "pytest-timeout", "pytest-xdist (>=3)", "tomli-w (>=1.0.0)", "virtualenv (>=13.0.0)", "wheel (>=0.44.0)"]
-type = ["importlib-metadata (>=7.0.2)", "jaraco.develop (>=7.21)", "mypy (==1.11.*)", "pytest-mypy"]
+test = ["build[virtualenv] (>=1.0.3)", "filelock (>=3.4.0)", "ini2toml[lite] (>=0.14)", "jaraco.develop (>=7.21) ; python_version >= \"3.9\" and sys_platform != \"cygwin\"", "jaraco.envs (>=2.2)", "jaraco.path (>=3.2.0)", "jaraco.test", "packaging (>=23.2)", "pip (>=19.1)", "pyproject-hooks (!=1.1)", "pytest (>=6,!=8.1.*)", "pytest-home (>=0.5)", "pytest-perf ; sys_platform != \"cygwin\"", "pytest-subprocess", "pytest-timeout", "pytest-xdist (>=3)", "tomli-w (>=1.0.0)", "virtualenv (>=13.0.0)", "wheel (>=0.44.0)"]
+type = ["importlib-metadata (>=7.0.2) ; python_version < \"3.10\"", "jaraco.develop (>=7.21) ; sys_platform != \"cygwin\"", "mypy (==1.11.*)", "pytest-mypy"]
 
 [[package]]
 name = "sgmllib3k"
@@ -4040,6 +4231,7 @@ version = "1.0.0"
 description = "Py3k port of sgmllib."
 optional = false
 python-versions = "*"
+groups = ["addons"]
 files = [
     {file = "sgmllib3k-1.0.0.tar.gz", hash = "sha256:7868fb1c8bfa764c1ac563d3cf369c381d1325d36124933a726f29fcdaa812e9"},
 ]
@@ -4050,6 +4242,7 @@ version = "1.16.0"
 description = "Python 2 and 3 compatibility utilities"
 optional = false
 python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*"
+groups = ["main", "addons", "dev"]
 files = [
     {file = "six-1.16.0-py2.py3-none-any.whl", hash = "sha256:8abb2f1d86890a2dfb989f9a77cfcfd3e47c2a354b01111771326f8aa26e0254"},
     {file = "six-1.16.0.tar.gz", hash = "sha256:1e61c37477a1626458e36f7b1d82aa5c9b094fa4802892072e49de9c60c4c926"},
@@ -4061,6 +4254,7 @@ version = "2.6"
 description = "A modern CSS selector implementation for Beautiful Soup."
 optional = false
 python-versions = ">=3.8"
+groups = ["dev"]
 files = [
     {file = "soupsieve-2.6-py3-none-any.whl", hash = "sha256:e72c4ff06e4fb6e4b5a9f0f55fe6e81514581fca1515028625d0f299c602ccc9"},
     {file = "soupsieve-2.6.tar.gz", hash = "sha256:e2e68417777af359ec65daac1057404a3c8a5455bb8abc36f1a9866ab1a51abb"},
@@ -4072,6 +4266,7 @@ version = "0.5.1"
 description = "A non-validating SQL parser."
 optional = false
 python-versions = ">=3.8"
+groups = ["main", "dev"]
 files = [
     {file = "sqlparse-0.5.1-py3-none-any.whl", hash = "sha256:773dcbf9a5ab44a090f3441e2180efe2560220203dc2f8c0b0fa141e18b505e4"},
     {file = "sqlparse-0.5.1.tar.gz", hash = "sha256:bb6b4df465655ef332548e24f08e205afc81b9ab86cb1c45657a7ff173a3a00e"},
@@ -4087,6 +4282,7 @@ version = "0.6.3"
 description = "Extract data from python stack frames and tracebacks for informative displays"
 optional = false
 python-versions = "*"
+groups = ["dev"]
 files = [
     {file = "stack_data-0.6.3-py3-none-any.whl", hash = "sha256:d5558e0c25a4cb0853cddad3d77da9891a08cb85dd9f9f91b9f8cd66e511e695"},
     {file = "stack_data-0.6.3.tar.gz", hash = "sha256:836a778de4fec4dcd1dcd89ed8abff8a221f58308462e1c4aa2a3cf30148f0b9"},
@@ -4106,6 +4302,7 @@ version = "2.2.0"
 description = "A lightweight and fast pure python ECDSA library"
 optional = false
 python-versions = "*"
+groups = ["main"]
 files = [
     {file = "starkbank-ecdsa-2.2.0.tar.gz", hash = "sha256:9399c3371b899d4a235b68a1ed7919d202fbf024bd2c863ae8ebdad343c2a63a"},
 ]
@@ -4116,6 +4313,7 @@ version = "3.3.8"
 description = "Stone is an interface description language (IDL) for APIs."
 optional = false
 python-versions = "*"
+groups = ["addons"]
 files = [
     {file = "stone-3.3.8-py3-none-any.whl", hash = "sha256:7238d928ea0a67e40f8c3ef974c4dbd22121d776fb86d6c836e7b6e71cfcf875"},
     {file = "stone-3.3.8.tar.gz", hash = "sha256:108a35176db2d40e60af6b421504127cc7fd56d9428b9136af9f8a5584b403e8"},
@@ -4132,6 +4330,7 @@ version = "1.2.1"
 description = "A tiny CSS parser"
 optional = false
 python-versions = ">=3.7"
+groups = ["main", "addons"]
 files = [
     {file = "tinycss2-1.2.1-py3-none-any.whl", hash = "sha256:2b80a96d41e7c3914b8cda8bc7f705a4d9c49275616e886103dd839dfc847847"},
     {file = "tinycss2-1.2.1.tar.gz", hash = "sha256:8cff3a8f066c2ec677c06dbc7b45619804a6938478d9d73c284b29d14ecb0627"},
@@ -4150,6 +4349,7 @@ version = "4.66.2"
 description = "Fast, Extensible Progress Meter"
 optional = false
 python-versions = ">=3.7"
+groups = ["main"]
 files = [
     {file = "tqdm-4.66.2-py3-none-any.whl", hash = "sha256:1ee4f8a893eb9bef51c6e35730cebf234d5d0b6bd112b0271e10ed7c24a02bd9"},
     {file = "tqdm-4.66.2.tar.gz", hash = "sha256:6cd52cdf0fef0e0f543299cfc96fec90d7b8a7e88745f411ec33eb44d5ed3531"},
@@ -4170,6 +4370,7 @@ version = "5.14.3"
 description = "Traitlets Python configuration system"
 optional = false
 python-versions = ">=3.8"
+groups = ["dev"]
 files = [
     {file = "traitlets-5.14.3-py3-none-any.whl", hash = "sha256:b74e89e397b1ed28cc831db7aea759ba6640cb3de13090ca145426688ff1ac4f"},
     {file = "traitlets-5.14.3.tar.gz", hash = "sha256:9ed0579d3502c94b4b3732ac120375cda96f923114522847de4b3bb98b96b6b7"},
@@ -4185,6 +4386,7 @@ version = "0.8.11"
 description = "A lightweight, object-oriented Python state machine implementation with many extensions."
 optional = false
 python-versions = "*"
+groups = ["main"]
 files = [
     {file = "transitions-0.8.11-py2.py3-none-any.whl", hash = "sha256:9525dd9b708b0a54bb4562a06a483d237e75c94547ba9831c81c6872d0ea1522"},
     {file = "transitions-0.8.11.tar.gz", hash = "sha256:7b20d32906ea4d60ee6f6c1f5dc9c9f178802425c5b155213eb0f25c277f04e4"},
@@ -4203,6 +4405,7 @@ version = "2.9.0.20240906"
 description = "Typing stubs for python-dateutil"
 optional = false
 python-versions = ">=3.8"
+groups = ["addons"]
 files = [
     {file = "types-python-dateutil-2.9.0.20240906.tar.gz", hash = "sha256:9706c3b68284c25adffc47319ecc7947e5bb86b3773f843c73906fd598bc176e"},
     {file = "types_python_dateutil-2.9.0.20240906-py3-none-any.whl", hash = "sha256:27c8cc2d058ccb14946eebcaaa503088f4f6dbc4fb6093d3d456a49aef2753f6"},
@@ -4214,10 +4417,12 @@ version = "2024.1"
 description = "Provider of IANA time zone data"
 optional = false
 python-versions = ">=2"
+groups = ["main", "dev"]
 files = [
     {file = "tzdata-2024.1-py2.py3-none-any.whl", hash = "sha256:9068bc196136463f5245e51efda838afa15aaeca9903f49050dfa2679db4d252"},
     {file = "tzdata-2024.1.tar.gz", hash = "sha256:2674120f8d891909751c38abcdfd386ac0a5a1127954fbc332af6b5ceae07efd"},
 ]
+markers = {dev = "sys_platform == \"win32\""}
 
 [[package]]
 name = "uritemplate"
@@ -4225,6 +4430,7 @@ version = "4.1.1"
 description = "Implementation of RFC 6570 URI Templates"
 optional = false
 python-versions = ">=3.6"
+groups = ["main", "addons"]
 files = [
     {file = "uritemplate-4.1.1-py2.py3-none-any.whl", hash = "sha256:830c08b8d99bdd312ea4ead05994a38e8936266f84b9a7878232db50b044e02e"},
     {file = "uritemplate-4.1.1.tar.gz", hash = "sha256:4346edfc5c3b79f694bccd6d6099a322bbeb628dbf2cd86eea55a456ce5124f0"},
@@ -4236,14 +4442,15 @@ version = "1.26.18"
 description = "HTTP library with thread-safe connection pooling, file post, and more."
 optional = false
 python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, !=3.5.*"
+groups = ["main", "addons", "dev"]
 files = [
     {file = "urllib3-1.26.18-py2.py3-none-any.whl", hash = "sha256:34b97092d7e0a3a8cf7cd10e386f401b3737364026c45e622aa02903dffe0f07"},
     {file = "urllib3-1.26.18.tar.gz", hash = "sha256:f8ecc1bba5667413457c529ab955bf8c67b45db799d159066261719e328580a0"},
 ]
 
 [package.extras]
-brotli = ["brotli (==1.0.9)", "brotli (>=1.0.9)", "brotlicffi (>=0.8.0)", "brotlipy (>=0.6.0)"]
-secure = ["certifi", "cryptography (>=1.3.4)", "idna (>=2.0.0)", "ipaddress", "pyOpenSSL (>=0.14)", "urllib3-secure-extra"]
+brotli = ["brotli (==1.0.9) ; os_name != \"nt\" and python_version < \"3\" and platform_python_implementation == \"CPython\"", "brotli (>=1.0.9) ; python_version >= \"3\" and platform_python_implementation == \"CPython\"", "brotlicffi (>=0.8.0) ; (os_name != \"nt\" or python_version >= \"3\") and platform_python_implementation != \"CPython\"", "brotlipy (>=0.6.0) ; os_name == \"nt\" and python_version < \"3\""]
+secure = ["certifi", "cryptography (>=1.3.4)", "idna (>=2.0.0)", "ipaddress ; python_version == \"2.7\"", "pyOpenSSL (>=0.14)", "urllib3-secure-extra"]
 socks = ["PySocks (>=1.5.6,!=1.5.7,<2.0)"]
 
 [[package]]
@@ -4252,6 +4459,7 @@ version = "2.0.24"
 description = "The uWSGI server"
 optional = false
 python-versions = "*"
+groups = ["release"]
 files = [
     {file = "uwsgi-2.0.24.tar.gz", hash = "sha256:77b6dd5cd633f4ae87ee393f7701f617736815499407376e78f3d16467523afe"},
 ]
@@ -4262,6 +4470,7 @@ version = "5.1.0"
 description = "Python promises."
 optional = false
 python-versions = ">=3.6"
+groups = ["main"]
 files = [
     {file = "vine-5.1.0-py3-none-any.whl", hash = "sha256:40fdf3c48b2cfe1c38a49e9ae2da6fda88e4794c810050a728bd7413811fb1dc"},
     {file = "vine-5.1.0.tar.gz", hash = "sha256:8b62e981d35c41049211cf62a0a1242d8c1ee9bd15bb196ce38aefd6799e61e0"},
@@ -4273,6 +4482,7 @@ version = "20.26.5"
 description = "Virtual Python Environment builder"
 optional = false
 python-versions = ">=3.7"
+groups = ["dev"]
 files = [
     {file = "virtualenv-20.26.5-py3-none-any.whl", hash = "sha256:4f3ac17b81fba3ce3bd6f4ead2749a72da5929c01774948e243db9ba41df4ff6"},
     {file = "virtualenv-20.26.5.tar.gz", hash = "sha256:ce489cac131aa58f4b25e321d6d186171f78e6cb13fafbf32a840cee67733ff4"},
@@ -4285,17 +4495,18 @@ platformdirs = ">=3.9.1,<5"
 
 [package.extras]
 docs = ["furo (>=2023.7.26)", "proselint (>=0.13)", "sphinx (>=7.1.2,!=7.3)", "sphinx-argparse (>=0.4)", "sphinxcontrib-towncrier (>=0.2.1a0)", "towncrier (>=23.6)"]
-test = ["covdefaults (>=2.3)", "coverage (>=7.2.7)", "coverage-enable-subprocess (>=1)", "flaky (>=3.7)", "packaging (>=23.1)", "pytest (>=7.4)", "pytest-env (>=0.8.2)", "pytest-freezer (>=0.4.8)", "pytest-mock (>=3.11.1)", "pytest-randomly (>=3.12)", "pytest-timeout (>=2.1)", "setuptools (>=68)", "time-machine (>=2.10)"]
+test = ["covdefaults (>=2.3)", "coverage (>=7.2.7)", "coverage-enable-subprocess (>=1)", "flaky (>=3.7)", "packaging (>=23.1)", "pytest (>=7.4)", "pytest-env (>=0.8.2)", "pytest-freezer (>=0.4.8) ; platform_python_implementation == \"PyPy\" or platform_python_implementation == \"CPython\" and sys_platform == \"win32\" and python_version >= \"3.13\"", "pytest-mock (>=3.11.1)", "pytest-randomly (>=3.12)", "pytest-timeout (>=2.1)", "setuptools (>=68)", "time-machine (>=2.10) ; platform_python_implementation == \"CPython\""]
 
 [[package]]
 name = "waitress"
-version = "3.0.0"
+version = "3.0.1"
 description = "Waitress WSGI server"
 optional = false
-python-versions = ">=3.8.0"
+python-versions = ">=3.9.0"
+groups = ["dev"]
 files = [
-    {file = "waitress-3.0.0-py3-none-any.whl", hash = "sha256:2a06f242f4ba0cc563444ca3d1998959447477363a2d7e9b8b4d75d35cfd1669"},
-    {file = "waitress-3.0.0.tar.gz", hash = "sha256:005da479b04134cdd9dd602d1ee7c49d79de0537610d653674cc6cbde222b8a1"},
+    {file = "waitress-3.0.1-py3-none-any.whl", hash = "sha256:26cdbc593093a15119351690752c99adc13cbc6786d75f7b6341d1234a3730ac"},
+    {file = "waitress-3.0.1.tar.gz", hash = "sha256:ef0c1f020d9f12a515c4ec65c07920a702613afcad1dbfdc3bcec256b6c072b3"},
 ]
 
 [package.extras]
@@ -4308,6 +4519,7 @@ version = "0.2.13"
 description = "Measures the displayed width of unicode strings in a terminal"
 optional = false
 python-versions = "*"
+groups = ["main", "dev"]
 files = [
     {file = "wcwidth-0.2.13-py2.py3-none-any.whl", hash = "sha256:3da69048e4540d84af32131829ff948f1e022c1c6bdb8d6102117aac784f6859"},
     {file = "wcwidth-0.2.13.tar.gz", hash = "sha256:72ea0c06399eb286d978fdedb6923a9eb47e1c486ce63e9b4e64fc18303972b5"},
@@ -4319,6 +4531,7 @@ version = "0.5.1"
 description = "Character encoding aliases for legacy web content"
 optional = false
 python-versions = "*"
+groups = ["main", "addons"]
 files = [
     {file = "webencodings-0.5.1-py2.py3-none-any.whl", hash = "sha256:a0af1213f3c2226497a97e2b3aa01a7e4bee4f403f95be16fc9acd2947514a78"},
     {file = "webencodings-0.5.1.tar.gz", hash = "sha256:b36a1c245f2d304965eb4e0a82848379241dc04b865afcc4aab16748587e1923"},
@@ -4330,6 +4543,7 @@ version = "1.8.8"
 description = "WSGI request and response object"
 optional = false
 python-versions = "!=3.0.*,!=3.1.*,!=3.2.*,>=2.7"
+groups = ["dev"]
 files = [
     {file = "WebOb-1.8.8-py2.py3-none-any.whl", hash = "sha256:b60ba63f05c0cf61e086a10c3781a41fcfe30027753a8ae6d819c77592ce83ea"},
     {file = "webob-1.8.8.tar.gz", hash = "sha256:2abc1555e118fc251e705fc6dc66c7f5353bb9fbfab6d20e22f1c02b4b71bcee"},
@@ -4345,6 +4559,7 @@ version = "3.0.1"
 description = "Helper to test WSGI applications"
 optional = false
 python-versions = ">=3.7"
+groups = ["dev"]
 files = [
     {file = "WebTest-3.0.1-py3-none-any.whl", hash = "sha256:b3bc75d020d0576ee93a5f149666045e58fe2400ea5f0c214d7430d7d213d0d0"},
     {file = "webtest-3.0.1.tar.gz", hash = "sha256:493b5c802f8948a65b5e3a1ad5b2524ee5e1ab60cd713d9a3da3b8da082c06fe"},
@@ -4365,6 +4580,7 @@ version = "1.0.0"
 description = "An extension of WebTest with useful extras, including requests-style authentication."
 optional = false
 python-versions = "*"
+groups = ["dev"]
 files = [
     {file = "webtest-plus-1.0.0.tar.gz", hash = "sha256:2bebad7ac36c895daffa09def88d27c0cd9683e142a84a518b82b264a3a06872"},
     {file = "webtest_plus-1.0.0-py2.py3-none-any.whl", hash = "sha256:70c1eb5092863d2d769984c5aee56d577817a189bee149e622e4ecb68caf3270"},
@@ -4379,6 +4595,7 @@ version = "3.0.3"
 description = "The comprehensive WSGI web application library."
 optional = false
 python-versions = ">=3.8"
+groups = ["main"]
 files = [
     {file = "werkzeug-3.0.3-py3-none-any.whl", hash = "sha256:fc9645dc43e03e4d630d23143a04a7f947a9a3b5727cd535fdfe155a17cc48c8"},
     {file = "werkzeug-3.0.3.tar.gz", hash = "sha256:097e5bfda9f0aba8da6b8545146def481d06aa7d3266e7448e2cccf67dd8bd18"},
@@ -4396,6 +4613,7 @@ version = "0.42.0"
 description = "A built-package format for Python"
 optional = false
 python-versions = ">=3.7"
+groups = ["main"]
 files = [
     {file = "wheel-0.42.0-py3-none-any.whl", hash = "sha256:177f9c9b0d45c47873b619f5b650346d632cdc35fb5e4d25058e09c9e581433d"},
     {file = "wheel-0.42.0.tar.gz", hash = "sha256:c45be39f7882c9d34243236f2d63cbd58039e360f85d0913425fbd7ceea617a8"},
@@ -4410,6 +4628,7 @@ version = "3.1.2"
 description = "Form validation and rendering for Python web development."
 optional = false
 python-versions = ">=3.8"
+groups = ["main"]
 files = [
     {file = "wtforms-3.1.2-py3-none-any.whl", hash = "sha256:bf831c042829c8cdbad74c27575098d541d039b1faa74c771545ecac916f2c07"},
     {file = "wtforms-3.1.2.tar.gz", hash = "sha256:f8d76180d7239c94c6322f7990ae1216dae3659b7aa1cee94b6318bdffb474b9"},
@@ -4427,6 +4646,7 @@ version = "5.0"
 description = "Very basic event publishing system"
 optional = false
 python-versions = ">=3.7"
+groups = ["main"]
 files = [
     {file = "zope.event-5.0-py3-none-any.whl", hash = "sha256:2832e95014f4db26c47a13fdaef84cef2f4df37e66b59d8f1f4a8f319a632c26"},
     {file = "zope.event-5.0.tar.gz", hash = "sha256:bac440d8d9891b4068e2b5a2c5e2c9765a9df762944bda6955f96bb9b91e67cd"},
@@ -4445,6 +4665,7 @@ version = "7.0.3"
 description = "Interfaces for Python"
 optional = false
 python-versions = ">=3.8"
+groups = ["main"]
 files = [
     {file = "zope.interface-7.0.3-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:9b9369671a20b8d039b8e5a1a33abd12e089e319a3383b4cc0bf5c67bd05fe7b"},
     {file = "zope.interface-7.0.3-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:db6237e8fa91ea4f34d7e2d16d74741187e9105a63bbb5686c61fea04cdbacca"},
@@ -4491,6 +4712,6 @@ test = ["coverage (>=5.0.3)", "zope.event", "zope.testing"]
 testing = ["coverage (>=5.0.3)", "zope.event", "zope.testing"]
 
 [metadata]
-lock-version = "2.0"
+lock-version = "2.1"
 python-versions = "^3.12"
-content-hash = "97027b7b20e0909d572fa21fc49a80fc5d67cfc61f40262928e239086a6c46cf"
+content-hash = "07a5081a731599efec5bc45ca753a024e427072954be6c4029278c116f9877e5"
diff --git a/pyproject.toml b/pyproject.toml
index dab80daf6da..1d624f43fb9 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -110,6 +110,7 @@ webtest-plus = "1.0.0"
 Faker = "23.2.1"
 schema = "0.7.4"
 responses = "0.25.0"
+waitress = "3.0.1"
 
 # Syntax checking
 flake8 = "7.0.0"
diff --git a/scripts/approve_embargo_terminations.py b/scripts/approve_embargo_terminations.py
index 6cb0a198231..99a6d1019df 100644
--- a/scripts/approve_embargo_terminations.py
+++ b/scripts/approve_embargo_terminations.py
@@ -1,5 +1,5 @@
 """EmbargoTerminationApprovals are the Sanction subclass that allows users
-to make Embargoes public before the official end date. Like RegistrationAprpovals
+to make Embargoes public before the official end date. Like RegistrationApprovals
 and Embargoes, if an admin fails to approve or reject this request within 48
 hours it is approved automagically.
 
diff --git a/scripts/fix_nodes_with_no_creator.py b/scripts/fix_nodes_with_no_creator.py
index 8e6407068ae..7e3d65f7170 100644
--- a/scripts/fix_nodes_with_no_creator.py
+++ b/scripts/fix_nodes_with_no_creator.py
@@ -19,7 +19,7 @@ def main():
         qs = AbstractNode.objects.filter(creator__isnull=True)
         logger.info(f'Found {qs.count()} nodes with no creator')
         for node in AbstractNode.objects.filter(creator__isnull=True):
-            logger.info(f'Setting the creator for AbstractNode {node._id} to the first contrbutor')
+            logger.info(f'Setting the creator for AbstractNode {node._id} to the first contributor')
             AbstractNode.objects.filter(id=node.id).update(creator=node.contributors.first())
         if dry:
             raise Exception('Abort Transaction - Dry Run')
diff --git a/scripts/image_manipulation/size_insitutions_images_for_circle.py b/scripts/image_manipulation/size_institutions_images_for_circle.py
similarity index 87%
rename from scripts/image_manipulation/size_insitutions_images_for_circle.py
rename to scripts/image_manipulation/size_institutions_images_for_circle.py
index 4febc65c37a..8409f4aa2bd 100644
--- a/scripts/image_manipulation/size_insitutions_images_for_circle.py
+++ b/scripts/image_manipulation/size_institutions_images_for_circle.py
@@ -2,7 +2,7 @@
 import math
 import os
 
-#This script enlarges institions shield imamges so the corners show when they are displayed as circles.
+#This script enlarges institutions shield images so the corners show when they are displayed as circles.
 
 INSTITUTIONS_IMG_PATH =  '../website/static/img/institutions/'
 
@@ -29,7 +29,7 @@ def alphaToWhite(img):
 def generateTestHTML(size):
 
     path = INSTITUTIONS_IMG_PATH + 'shields-rounded-corners/'
-    f = open('image_maniplation/test_rounded_corners.html','w')
+    f = open('image_manipulation/test_rounded_corners.html','w')
     f.write('<body style=background-color:lightgrey;>\n')
     for shieldName in os.listdir(path):
         f.write('<img src={0} style="border-radius:100%;height:{1};width:{1};">\n'.format('../'+path + shieldName, size))
@@ -47,5 +47,5 @@ def main():
             img.save(INSTITUTIONS_IMG_PATH + 'shields-rounded-corners/'+ shield[:-4] + '-rounded-corners.png')
 
     generateTestHTML(size=100)
-    print('This script removes transparency from images, check the test html to ensure a the quality has been maintained')
+    print('This script removes transparency from images, check the test html to ensure that the quality has been maintained')
 main()
\ No newline at end of file
diff --git a/scripts/normalize_user_tags.py b/scripts/normalize_user_tags.py
index a1ce830bc47..279448a3082 100644
--- a/scripts/normalize_user_tags.py
+++ b/scripts/normalize_user_tags.py
@@ -120,7 +120,7 @@ def add_tags(tags):
 
 
 def normalize_source_tags():
-    """ Normailize source tags
+    """ Normalize source tags
     """
     migrate_source_tags(PROVIDER_SOURCE_TAGS)
     migrate_source_tags(CAMPAIGN_SOURCE_TAGS)
diff --git a/scripts/osfstorage/usage_audit.py b/scripts/osfstorage/usage_audit.py
index 8a8ffb6c1f1..c97222aaa13 100644
--- a/scripts/osfstorage/usage_audit.py
+++ b/scripts/osfstorage/usage_audit.py
@@ -3,7 +3,7 @@
 Projects or users can have their GUID whitelisted via `usage_audit whitelist [GUID ...]`
 User usage is defined as the total usage of all projects they have > READ access on
 Project usage is defined as the total usage of it and all its children
-total usage is defined as the sum of the size of all verions associated with X via OsfStorageFileNode and OsfStorageTrashedFileNode
+total usage is defined as the sum of the size of all versions associated with X via OsfStorageFileNode and OsfStorageTrashedFileNode
 """
 
 import os
diff --git a/scripts/populate_institutions.py b/scripts/populate_institutions.py
index fb13a0c30a4..f46f7c67113 100644
--- a/scripts/populate_institutions.py
+++ b/scripts/populate_institutions.py
@@ -243,7 +243,7 @@ def main(default_args=False):
             {
                 '_id': 'cornell',
                 'name': 'Cornell University',
-                'description': 'Supported by the Cornell Research Data Management Service Group and the Cornell University Library. The OSF service may not be used to store or transfer personally identifiable, confidential/restricted, HIPPA-regulated or any other controlled unclassified information. Learn more at <a href="https://data.research.cornell.edu">https://data.research.cornell.edu</a> | <a href="mailto:rdmsg-help@cornell.edu">rdmsg-help@cornell.edu</a>.',
+                'description': 'Supported by the Cornell Research Data Management Service Group and the Cornell University Library. The OSF service may not be used to store or transfer personally identifiable, confidential/restricted, HIPAA-regulated or any other controlled unclassified information. Learn more at <a href="https://data.research.cornell.edu">https://data.research.cornell.edu</a> | <a href="mailto:rdmsg-help@cornell.edu">rdmsg-help@cornell.edu</a>.',
                 'login_url': SHIBBOLETH_SP_LOGIN.format(encode_uri_component('https://shibidp.cit.cornell.edu/idp/shibboleth')),
                 'logout_url': SHIBBOLETH_SP_LOGOUT.format(encode_uri_component('https://osf.io/goodbye')),
                 'domains': [],
@@ -602,7 +602,7 @@ def main(default_args=False):
             {
                 '_id': 'purdue',
                 'name': 'Purdue University',
-                'description': 'This open scholarship platform is provided by <a href="https://www.lib.purdue.edu/">Purdue University Libraries</a> in partnership with the University\'s <a href="https://www.purdue.edu/gradschool/">Graduate School</a>, <a href="https://www.purdue.edu/research/oevprp/regulatory-affairs/">Regulatory Affairs</a>, and <a href="https://www.purdue.edu/provost/researchIntegrity/">Research Integrity Office</a>.<br><br>All projects must adhere to Purdue\'s <a href="https://www.purdue.edu/policies/information-technology/viib8.html#statement">Information security</a>, <a href="https://www.purdue.edu/policies/academic-research-affairs/ic1.html">Human subjects research</a> policies, and related <a href="https://www.purdue.edu/securepurdue/data-handling/index.php">data classification and handling procedures</a>. Associated guidance on regulations is available via the <a href="https://www.purdue.edu/research/oevprp/regulatory-affairs/responsible-conduct.php">Responsible Conductof Research website</a> and the <a href="https://www.purdue.edu/provost/researchIntegrity/">Research Integrity Office</a>. For questions and support please reach out to <a href="mailto:riboehm@purdue.edu">Purdue\'s OSF contact</a>.',
+                'description': 'This open scholarship platform is provided by <a href="https://www.lib.purdue.edu/">Purdue University Libraries</a> in partnership with the University\'s <a href="https://www.purdue.edu/gradschool/">Graduate School</a>, <a href="https://www.purdue.edu/research/oevprp/regulatory-affairs/">Regulatory Affairs</a>, and <a href="https://www.purdue.edu/provost/researchIntegrity/">Research Integrity Office</a>.<br><br>All projects must adhere to Purdue\'s <a href="https://www.purdue.edu/policies/information-technology/viib8.html#statement">Information security</a>, <a href="https://www.purdue.edu/policies/academic-research-affairs/ic1.html">Human subjects research</a> policies, and related <a href="https://www.purdue.edu/securepurdue/data-handling/index.php">data classification and handling procedures</a>. Associated guidance on regulations is available via the <a href="https://www.purdue.edu/research/oevprp/regulatory-affairs/responsible-conduct.php">Responsible Conduct of Research website</a> and the <a href="https://www.purdue.edu/provost/researchIntegrity/">Research Integrity Office</a>. For questions and support please reach out to <a href="mailto:riboehm@purdue.edu">Purdue\'s OSF contact</a>.',
                 'login_url': SHIBBOLETH_SP_LOGIN.format(encode_uri_component('https://idp.purdue.edu/idp/shibboleth')),
                 'logout_url': SHIBBOLETH_SP_LOGOUT.format(encode_uri_component('https://osf.io/goodbye')),
                 'domains': [],
@@ -764,7 +764,7 @@ def main(default_args=False):
             {
                 '_id': 'umb',
                 'name': 'University of Maryland, Baltimore',
-                'description': 'This research data management service is supported by the <a href="https://www2.hshsl.umaryland.edu/cdabs/">Center for Data and Bioinformtion Services</a> at the <a href="https://www.hshsl.umaryland.edu/">Health Sciences and Human Services Library</a>. This platform is not intended for the storage of PII or PHI.<br><a href="https://www.umaryland.edu/policies-and-procedures/library/research/policies/iv-9901a.php">UMB Policy Regarding Ownership, Management, and Sharing of Research Data</a> | For questions contact <a href="mailto:data@hshsl.umaryland.edu">data@hshsl.umaryland.edu</a>',
+                'description': 'This research data management service is supported by the <a href="https://www2.hshsl.umaryland.edu/cdabs/">Center for Data and Bioinformation Services</a> at the <a href="https://www.hshsl.umaryland.edu/">Health Sciences and Human Services Library</a>. This platform is not intended for the storage of PII or PHI.<br><a href="https://www.umaryland.edu/policies-and-procedures/library/research/policies/iv-9901a.php">UMB Policy Regarding Ownership, Management, and Sharing of Research Data</a> | For questions contact <a href="mailto:data@hshsl.umaryland.edu">data@hshsl.umaryland.edu</a>',
                 'login_url': SHIBBOLETH_SP_LOGIN.format(encode_uri_component('https://webauth.umaryland.edu/idp/shibboleth')),
                 'logout_url': SHIBBOLETH_SP_LOGOUT.format(encode_uri_component('https://osf.io/goodbye')),
                 'domains': [],
@@ -824,7 +824,7 @@ def main(default_args=False):
             {
                 '_id': 'usc',
                 'name': 'University of Southern California',
-                'description': 'Projects must abide by <a href="http://policy.usc.edu/info-security/">USC\'s Information Security Policy</a>. Data stored for human subject research repositories must abide by <a href="http://policy.usc.edu/biorepositories/">USC\'s Biorepository Policy</a>. The OSF may not be used for storage of Personal Health Information that is subject to <a href="http://policy.usc.edu/hipaa/">HIPPA regulations</a>.',
+                'description': 'Projects must abide by <a href="http://policy.usc.edu/info-security/">USC\'s Information Security Policy</a>. Data stored for human subject research repositories must abide by <a href="http://policy.usc.edu/biorepositories/">USC\'s Biorepository Policy</a>. The OSF may not be used for storage of Personal Health Information that is subject to <a href="http://policy.usc.edu/hipaa/">HIPAA regulations</a>.',
                 'login_url': SHIBBOLETH_SP_LOGIN.format(encode_uri_component('urn:mace:incommon:usc.edu')),
                 'logout_url': SHIBBOLETH_SP_LOGOUT.format(encode_uri_component('https://osf.io/goodbye')),
                 'domains': ['osf.usc.edu'],
@@ -1172,7 +1172,7 @@ def main(default_args=False):
             {
                 '_id': 'cornell',
                 'name': 'Cornell University [Test]',
-                'description': 'Supported by the Cornell Research Data Management Service Group and the Cornell University Library. The OSF service may not be used to store or transfer personally identifiable, confidential/restricted, HIPPA-regulated or any other controlled unclassified information. Learn more at <a href="https://data.research.cornell.edu">https://data.research.cornell.edu</a> | <a href="mailto:rdmsg-help@cornell.edu">rdmsg-help@cornell.edu</a>.',
+                'description': 'Supported by the Cornell Research Data Management Service Group and the Cornell University Library. The OSF service may not be used to store or transfer personally identifiable, confidential/restricted, HIPAA-regulated or any other controlled unclassified information. Learn more at <a href="https://data.research.cornell.edu">https://data.research.cornell.edu</a> | <a href="mailto:rdmsg-help@cornell.edu">rdmsg-help@cornell.edu</a>.',
                 'login_url': SHIBBOLETH_SP_LOGIN.format(encode_uri_component('https://shibidp.cit.cornell.edu/idp/shibboleth')),
                 'logout_url': SHIBBOLETH_SP_LOGOUT.format(encode_uri_component('https://test.osf.io/goodbye')),
                 'domains': ['test-osf-cornell.cos.io'],
@@ -1541,7 +1541,7 @@ def main(default_args=False):
             {
                 '_id': 'purdue',
                 'name': 'Purdue University [Test]',
-                'description': 'This open scholarship platform is provided by <a href="https://www.lib.purdue.edu/">Purdue University Libraries</a> in partnership with the University\'s <a href="https://www.purdue.edu/gradschool/">Graduate School</a>, <a href="https://www.purdue.edu/research/oevprp/regulatory-affairs/">Regulatory Affairs</a>, and <a href="https://www.purdue.edu/provost/researchIntegrity/">Research Integrity Office</a>.<br><br>All projects must adhere to Purdue\'s <a href="https://www.purdue.edu/policies/information-technology/viib8.html#statement">Information security</a>, <a href="https://www.purdue.edu/policies/academic-research-affairs/ic1.html">Human subjects research</a> policies, and related <a href="https://www.purdue.edu/securepurdue/data-handling/index.php">data classification and handling procedures</a>. Associated guidance on regulations is available via the <a href="https://www.purdue.edu/research/oevprp/regulatory-affairs/responsible-conduct.php">Responsible Conductof Research website</a> and the <a href="https://www.purdue.edu/provost/researchIntegrity/">Research Integrity Office</a>. For questions and support please reach out to <a href="mailto:riboehm@purdue.edu">Purdue\'s OSF contact</a>.',
+                'description': 'This open scholarship platform is provided by <a href="https://www.lib.purdue.edu/">Purdue University Libraries</a> in partnership with the University\'s <a href="https://www.purdue.edu/gradschool/">Graduate School</a>, <a href="https://www.purdue.edu/research/oevprp/regulatory-affairs/">Regulatory Affairs</a>, and <a href="https://www.purdue.edu/provost/researchIntegrity/">Research Integrity Office</a>.<br><br>All projects must adhere to Purdue\'s <a href="https://www.purdue.edu/policies/information-technology/viib8.html#statement">Information security</a>, <a href="https://www.purdue.edu/policies/academic-research-affairs/ic1.html">Human subjects research</a> policies, and related <a href="https://www.purdue.edu/securepurdue/data-handling/index.php">data classification and handling procedures</a>. Associated guidance on regulations is available via the <a href="https://www.purdue.edu/research/oevprp/regulatory-affairs/responsible-conduct.php">Responsible Conduct of Research website</a> and the <a href="https://www.purdue.edu/provost/researchIntegrity/">Research Integrity Office</a>. For questions and support please reach out to <a href="mailto:riboehm@purdue.edu">Purdue\'s OSF contact</a>.',
                 'login_url': SHIBBOLETH_SP_LOGIN.format(encode_uri_component('https://idp.purdue.edu/idp/shibboleth')),
                 'logout_url': SHIBBOLETH_SP_LOGOUT.format(encode_uri_component('https://test.osf.io/goodbye')),
                 'domains': [],
@@ -1683,7 +1683,7 @@ def main(default_args=False):
             {
                 '_id': 'umb',
                 'name': 'University of Maryland, Baltimore [Test]',
-                'description': 'This research data management service is supported by the <a href="https://www2.hshsl.umaryland.edu/cdabs/">Center for Data and Bioinformtion Services</a> at the <a href="https://www.hshsl.umaryland.edu/">Health Sciences and Human Services Library</a>. This platform is not intended for the storage of PII or PHI.<br><a href="https://www.umaryland.edu/policies-and-procedures/library/research/policies/iv-9901a.php">UMB Policy Regarding Ownership, Management, and Sharing of Research Data</a> | For questions contact <a href="mailto:data@hshsl.umaryland.edu">data@hshsl.umaryland.edu</a>',
+                'description': 'This research data management service is supported by the <a href="https://www2.hshsl.umaryland.edu/cdabs/">Center for Data and Bioinformation Services</a> at the <a href="https://www.hshsl.umaryland.edu/">Health Sciences and Human Services Library</a>. This platform is not intended for the storage of PII or PHI.<br><a href="https://www.umaryland.edu/policies-and-procedures/library/research/policies/iv-9901a.php">UMB Policy Regarding Ownership, Management, and Sharing of Research Data</a> | For questions contact <a href="mailto:data@hshsl.umaryland.edu">data@hshsl.umaryland.edu</a>',
                 'login_url': SHIBBOLETH_SP_LOGIN.format(encode_uri_component('https://webauth.umaryland.edu/idp/shibboleth')),
                 'logout_url': SHIBBOLETH_SP_LOGOUT.format(encode_uri_component('https://test.osf.io/goodbye')),
                 'domains': ['test-osf-umb.cos.io'],
@@ -1775,7 +1775,7 @@ def main(default_args=False):
             {
                 '_id': 'usc',
                 'name': 'University of Southern California [Test]',
-                'description': 'Projects must abide by <a href="http://policy.usc.edu/info-security/">USC\'s Information Security Policy</a>. Data stored for human subject research repositories must abide by <a href="http://policy.usc.edu/biorepositories/">USC\'s Biorepository Policy</a>. The OSF may not be used for storage of Personal Health Information that is subject to <a href="http://policy.usc.edu/hipaa/">HIPPA regulations</a>.',
+                'description': 'Projects must abide by <a href="http://policy.usc.edu/info-security/">USC\'s Information Security Policy</a>. Data stored for human subject research repositories must abide by <a href="http://policy.usc.edu/biorepositories/">USC\'s Biorepository Policy</a>. The OSF may not be used for storage of Personal Health Information that is subject to <a href="http://policy.usc.edu/hipaa/">HIPAA regulations</a>.',
                 'login_url': SHIBBOLETH_SP_LOGIN.format(encode_uri_component('urn:mace:incommon:usc.edu')),
                 'logout_url': SHIBBOLETH_SP_LOGOUT.format(encode_uri_component('https://test.osf.io/goodbye')),
                 'domains': ['test-osf-usc.cos.io'],
diff --git a/scripts/populate_preprint_providers.py b/scripts/populate_preprint_providers.py
index 1f354b3d05d..6ec45442181 100644
--- a/scripts/populate_preprint_providers.py
+++ b/scripts/populate_preprint_providers.py
@@ -482,7 +482,7 @@ def main(env):
                         <li><b>Khelif Karima</b>, Institut National de la Recherche Agronomique d'Algérie</li>
                         <li><b>Kuldeep Singh Jadon</b>, Central Arid Zone Research Institute</li>
                         <li><b>Paraj Shukla</b>, King Saud University</li>
-                        <li><b>Sridhar Gutam</b>,  ICAR RCER Research Centre/Open Access India</li>
+                        <li><b>Sridhar Gutam</b>, ICAR RCER Research Centre/Open Access India</li>
                         <li><b>Sumant Vyas</b>, National Research Centre on Camel</li>
                         <li><b>Susmita Das</b>, Bangladesh Agricultural Research Council</li>
                     </ul>
@@ -1029,7 +1029,7 @@ def main(env):
                 (['Social and Behavioral Sciences', 'Organization Development', 'Health Policy'], False),
                 (['Social and Behavioral Sciences', 'Organization Development', 'Infrastructure'], False),
                 (['Social and Behavioral Sciences', 'Organization Development', 'Policy Design, Analysis, and Evaluation'], False),
-                (['Social and Behavioral Sciences', 'Organization Development', 'Policy History, Theory, and Methosd'], False),
+                (['Social and Behavioral Sciences', 'Organization Development', 'Policy History, Theory, and Methods'], False),
                 (['Social and Behavioral Sciences', 'Organization Development', 'Science and Technology Policy'], False),
                 (['Social and Behavioral Sciences', 'Organization Development', 'Social Policy'], False),
                 (['Social and Behavioral Sciences', 'Organization Development', 'Social Welfare'], False),
diff --git a/scripts/send_queued_mails.py b/scripts/send_queued_mails.py
index 7c70c7685a0..0a33714555b 100644
--- a/scripts/send_queued_mails.py
+++ b/scripts/send_queued_mails.py
@@ -21,7 +21,7 @@
 def main(dry_run=True):
     # find all emails to be sent, pops the top one for each user(to obey the once
     # a week requirement), checks to see if one has been sent this week, and if
-    # not send the email, otherwise leave it in the queue
+    # not send the email; otherwise, leave it in the queue
 
     user_queue = {}
     for email in find_queued_mails_ready_to_be_sent():
diff --git a/scripts/tests/test_retract_registrations.py b/scripts/tests/test_retract_registrations.py
index a9ca4149791..7a0506c4276 100644
--- a/scripts/tests/test_retract_registrations.py
+++ b/scripts/tests/test_retract_registrations.py
@@ -25,7 +25,7 @@ def test_new_retraction_should_not_be_retracted(self):
         assert not self.registration.is_retracted
 
     def test_should_not_retract_pending_retraction_less_than_48_hours_old(self):
-        # Retraction#iniation_date is read only
+        # Retraction#initiation_date is read only
         self.registration.retraction.initiation_date = (timezone.now() - timedelta(hours=47))
         self.registration.retraction.save()
         assert not self.registration.is_retracted
@@ -34,7 +34,7 @@ def test_should_not_retract_pending_retraction_less_than_48_hours_old(self):
         assert not self.registration.is_retracted
 
     def test_should_retract_pending_retraction_that_is_48_hours_old(self):
-        # Retraction#iniation_date is read only
+        # Retraction#initiation_date is read only
         self.registration.retraction.initiation_date = (timezone.now() - timedelta(hours=48))
         self.registration.retraction.save()
         assert not self.registration.is_retracted
@@ -44,7 +44,7 @@ def test_should_retract_pending_retraction_that_is_48_hours_old(self):
         assert self.registration.is_retracted
 
     def test_should_retract_pending_retraction_more_than_48_hours_old(self):
-        # Retraction#iniation_date is read only
+        # Retraction#initiation_date is read only
         self.registration.retraction.initiation_date = (timezone.now() - timedelta(days=365))
         self.registration.retraction.save()
         assert not self.registration.is_retracted
@@ -55,7 +55,7 @@ def test_should_retract_pending_retraction_more_than_48_hours_old(self):
 
     def test_retraction_adds_to_parent_projects_log(self):
         initial_project_logs = len(self.registration.registered_from.logs.all())
-        # Retraction#iniation_date is read only
+        # Retraction#initiation_date is read only
         self.registration.retraction.initiation_date =(timezone.now() - timedelta(days=365))
         self.registration.retraction.save()
         assert not self.registration.is_retracted
diff --git a/tasks/__init__.py b/tasks/__init__.py
index 0d5aa2cc406..ae6294daa70 100755
--- a/tasks/__init__.py
+++ b/tasks/__init__.py
@@ -240,7 +240,7 @@ def requirements(ctx, base=False, addons=False, release=False, dev=True, all=Tru
         inv requirements
         inv requirements --all
 
-    You should use --all for updating your developement environment.
+    You should use --all for updating your development environment.
     --all will install (in order): addons, dev and the base requirements.
 
     By default, base requirements will run. However, if any set of addons, release, or dev are chosen, base
@@ -628,7 +628,7 @@ def bower_install(ctx):
 def docker_init(ctx):
     """Initial docker setup"""
     print('You will be asked for your sudo password to continue...')
-    if platform.system() == 'Darwin':  # Mac OSX
+    if platform.system() == 'Darwin':  # macOS
         ctx.run('sudo ifconfig lo0 alias 192.168.168.167')
     else:
         print('Your system is not recognized, you will have to setup docker manually')
@@ -665,7 +665,7 @@ def hotfix(ctx, name, finish=False, push=False):
     """Rename hotfix branch to hotfix/<next-patch-version> and optionally
     finish hotfix.
     """
-    print('Checking out master to calculate curent version')
+    print('Checking out master to calculate current version')
     ctx.run('git checkout master')
     latest_version = latest_tag_info()['current_version']
     print(f'Current version is: {latest_version}')
@@ -876,7 +876,7 @@ def set_maintenance(ctx, message='', level=1, start=None, end=None):
     """Display maintenance notice across OSF applications (incl. preprints, registries, etc.)
 
     start - Start time for the maintenance period
-    end - End time for the mainteance period
+    end - End time for the maintenance period
         NOTE: If no start or end values are provided, default to starting now
         and ending 24 hours from now.
     message - Message to display. If omitted, will be:
diff --git a/tests/identifiers/test_datacite.py b/tests/identifiers/test_datacite.py
index 768a400fc59..2bcd1605cf7 100644
--- a/tests/identifiers/test_datacite.py
+++ b/tests/identifiers/test_datacite.py
@@ -129,7 +129,7 @@ def test_datacite_build_metadata_for_dataarchive_registration(self, registration
         assert resource_type.text == 'Pre-registration'
         assert resource_type.attrib['resourceTypeGeneral'] == 'Dataset'
 
-    def test_datcite_format_contributors(self, datacite_client):
+    def test_datacite_format_contributors(self, datacite_client):
         visible_contrib = AuthUserFactory()
         visible_contrib2 = AuthUserFactory()
         visible_contrib2.given_name = 'ヽ༼ ಠ益ಠ ༽ﾉ'
@@ -155,7 +155,7 @@ def test_datcite_format_contributors(self, datacite_client):
         assert f'<creatorName nameType="Personal">{invisible_contrib.fullname}</creatorName>' not in metadata_xml
 
     def test_datacite_format_related_resources(self, datacite_client):
-        registration = RegistrationFactory(is_public=True, has_doi=True, article_doi='publication')
+        registration = RegistrationFactory(is_public=True, has_doi=True, article_doi='10.pub/lication')
         outcome = Outcome.objects.for_registration(registration, create=True)
         data_artifact = outcome.artifact_metadata.create(
             identifier=IdentifierFactory(category='doi'), artifact_type=ArtifactTypes.DATA, finalized=True
@@ -179,7 +179,7 @@ def test_datacite_format_related_resources(self, datacite_client):
                 'relationType': 'References',
             },
             {
-                'relatedIdentifier': 'publication',
+                'relatedIdentifier': '10.pub/lication',
                 'relatedIdentifierType': 'DOI',
                 'relationType': 'References',
             },
diff --git a/tests/json_api_test_app.py b/tests/json_api_test_app.py
index 0e192b1e1dc..23df11d2fb4 100644
--- a/tests/json_api_test_app.py
+++ b/tests/json_api_test_app.py
@@ -90,7 +90,7 @@ def do_request(self, req, status, expect_errors):
             # Add any rendered template detail to the response.
             # If there was only one template rendered (the most likely case),
             # flatten the list to a single element.
-            def flattend(detail):
+            def flattened(detail):
                 if len(data[detail]) == 1:
                     return data[detail][0]
                 return data[detail]
@@ -100,12 +100,12 @@ def flattend(detail):
             response.templates = data.get('templates', None)
 
             if data.get('context'):
-                response.context = flattend('context')
+                response.context = flattened('context')
 
             if data.get('template'):
-                response.template = flattend('template')
+                response.template = flattened('template')
             elif data.get('templates'):
-                response.template = flattend('templates')
+                response.template = flattened('templates')
 
             return response
         finally:
diff --git a/tests/test_adding_contributor_views.py b/tests/test_adding_contributor_views.py
index 5cb11e83578..7042bff28ac 100644
--- a/tests/test_adding_contributor_views.py
+++ b/tests/test_adding_contributor_views.py
@@ -630,7 +630,7 @@ def test_claim_user_already_registered_redirects_to_claim_user_registered(self,
         res = self.app.get(claim_url)
 
         # should redirect to 'claim_user_registered' view
-        claim_registered_url = f'/user/{unregistered_user._id}/{self.project._id}/claim/verify/{token}/'
+        claim_registered_url = f'/legacy/user/{unregistered_user._id}/{self.project._id}/claim/verify/{token}/'
         assert res.status_code == 302
         assert claim_registered_url in res.headers.get('Location')
 
@@ -672,7 +672,7 @@ def test_claim_user_already_registered_secondary_email_redirects_to_claim_user_r
         res = self.app.get(claim_url)
 
         # should redirect to 'claim_user_registered' view
-        claim_registered_url = f'/user/{unregistered_user._id}/{self.project._id}/claim/verify/{token}/'
+        claim_registered_url = f'/legacy/user/{unregistered_user._id}/{self.project._id}/claim/verify/{token}/'
         assert res.status_code == 302
         assert claim_registered_url in res.headers.get('Location')
 
@@ -797,7 +797,7 @@ def test_claim_user_form_redirects_to_password_confirm_page_if_user_is_logged_in
     def test_claim_user_when_user_is_registered_with_orcid(self, mock_response_from_ticket):
         # TODO: check in qa url encoding
         token = self.user.get_unclaimed_record(self.project._primary_key)['token']
-        url = f'/user/{self.user._id}/{self.project._id}/claim/verify/{token}/'
+        url = f'/legacy/user/{self.user._id}/{self.project._id}/claim/verify/{token}/'
         # logged out user gets redirected to cas login
         res1 = self.app.get(url)
         assert res1.status_code == 302
@@ -820,7 +820,7 @@ def test_claim_user_when_user_is_registered_with_orcid(self, mock_response_from_
         url_with_service_ticket = f'{url}?ticket={service_ticket}'
         res = self.app.get(url_with_service_ticket)
         # The response of this request is expected to be a 302 with `Location`.
-        # And the redirect URL must equal to the originial service URL
+        # And the redirect URL must equal to the original service URL
         assert res.status_code == 302
         redirect_url = res.headers['Location']
         assert redirect_url == url
@@ -938,7 +938,7 @@ def test_claim_user_post_returns_fullname(self):
         assert self.mock_send_grid.called
 
     def test_claim_user_post_if_email_is_different_from_given_email(self):
-        email = fake_email()  # email that is different from the one the referrer gave
+        email = fake_email()  # email that is different from the one given by the referrer
         url = f'/api/v1/user/{self.user._primary_key}/{self.project._primary_key}/claim/email/'
         self.app.post(url, json={'value': email, 'pk': self.user._primary_key} )
         assert self.mock_send_grid.called
@@ -958,7 +958,7 @@ def test_claim_url_with_bad_token_returns_400(self):
         assert res.status_code == 400
 
     def test_cannot_claim_user_with_user_who_is_already_contributor(self):
-        # user who is already a contirbutor to the project
+        # user who is already a contributor to the project
         contrib = AuthUserFactory()
         self.project.add_contributor(contrib, auth=Auth(self.project.creator))
         self.project.save()
diff --git a/tests/test_addons.py b/tests/test_addons.py
index f6fda06a024..4c5d3f93f55 100644
--- a/tests/test_addons.py
+++ b/tests/test_addons.py
@@ -1463,7 +1463,7 @@ def test_nonstorage_addons_raise(self):
         assert resp.status_code == 400
 
     @mock.patch('website.views.stream_emberapp')
-    def test_head_returns_url_and_redriect(self, mock_ember):
+    def test_head_returns_url_and_redirect(self, mock_ember):
         file_node = self.get_test_file()
         guid = file_node.get_guid(create=True)
 
@@ -1650,7 +1650,7 @@ def test_update_logs_to_sentry_when_called_with_disordered_metadata(self, mock_c
         file_node.update(revision=None, user=None, data=data)
         mock_set_context.return_value.__enter__.return_value.set_extra.assert_called_once_with('session', {})
         mock_capture.assert_called_with(
-            'update() receives metatdata older than the newest entry in file history.',
+            'update() receives metadata older than the newest entry in file history.',
             level='error',
         )
 
@@ -1826,7 +1826,7 @@ def test_serialize_addons(self, mock_folders):
 
     @mock.patch('addons.github.models.NodeSettings.get_folders', return_value=[])
     def test_include_template_json(self, mock_folders):
-        """ Some addons (github, gitlab) need more specialized template infomation so we want to
+        """ Some addons (github, gitlab) need more specialized template information so we want to
         ensure we get those extra variables that when the addon is enabled.
         """
         addon_dicts = serialize_addons(self.node, self.auth_obj)
diff --git a/tests/test_auth_views.py b/tests/test_auth_views.py
index 31445da2c8d..8fe2b0ac12e 100644
--- a/tests/test_auth_views.py
+++ b/tests/test_auth_views.py
@@ -482,7 +482,7 @@ def test_resend_confirmation_not_work_for_primary_email(self):
         header = {'address': email, 'primary': True, 'confirmed': False}
         res = self.app.put(url, json={'id': self.user._id, 'email': header}, auth=self.user.auth)
         assert res.status_code == 400
-        assert res.json['message_long'] == 'Cannnot resend confirmation for confirmed emails'
+        assert res.json['message_long'] == 'Cannot resend confirmation for confirmed emails'
 
     def test_resend_confirmation_not_work_for_confirmed_email(self):
         email = 'test@mail.com'
@@ -490,7 +490,7 @@ def test_resend_confirmation_not_work_for_confirmed_email(self):
         header = {'address': email, 'primary': False, 'confirmed': True}
         res = self.app.put(url, json={'id': self.user._id, 'email': header}, auth=self.user.auth)
         assert res.status_code == 400
-        assert res.json['message_long'] == 'Cannnot resend confirmation for confirmed emails'
+        assert res.json['message_long'] == 'Cannot resend confirmation for confirmed emails'
 
     def test_resend_confirmation_does_not_send_before_throttle_expires(self):
         email = 'test@mail.com'
@@ -624,7 +624,7 @@ def test_institution_login_next_url_without_auth(self):
         assert data.get('status_code') == http_status.HTTP_302_FOUND
         assert data.get('next_url') == cas.get_login_url(self.next_url, campaign='institution')
 
-    def test_institution_regsiter_with_auth(self):
+    def test_institution_register_with_auth(self):
         # institution register: user with auth
         data = login_and_register_handler(self.auth, login=False, campaign='institution')
         assert data.get('status_code') == http_status.HTTP_302_FOUND
@@ -761,7 +761,7 @@ def test_register_logout_flag_with_auth(self):
         assert data.get('status_code') == 'auth_logout'
         assert data.get('next_url') == self.next_url
 
-    def test_register_logout_flage_without(self):
+    def test_register_logout_flag_without(self):
         # the second step is to land user on register page with "MUST LOGIN" warning
         data = login_and_register_handler(self.no_auth, login=False, campaign=None, next_url=self.next_url, logout=True)
         assert data.get('status_code') == http_status.HTTP_200_OK
diff --git a/tests/test_ember_osf_web.py b/tests/test_ember_osf_web.py
index f25ac1af961..31868132fb7 100644
--- a/tests/test_ember_osf_web.py
+++ b/tests/test_ember_osf_web.py
@@ -24,7 +24,7 @@ def test_use_ember_app(self, mock_use_ember_app):
 
     @mock.patch('website.ember_osf_web.decorators.use_ember_app')
     def test_dont_use_ember_app(self, mock_use_ember_app):
-        # mock over external module 'waflle.flag_is_active` not ours
+        # mock over external module 'waffle.flag_is_active` not ours
 
         ember_flag_is_active('inactive_flag')(self.mock_func)()
 
@@ -34,7 +34,7 @@ def test_dont_use_ember_app(self, mock_use_ember_app):
     @mock.patch('website.ember_osf_web.decorators.flag_is_active')
     @mock.patch('website.ember_osf_web.decorators.use_ember_app')
     def test_ember_flag_is_active_authenticated_user(self, mock_use_ember_app, mock_flag_is_active, mock__get_current_user):
-        # mock over external module 'waflle.flag_is_active` not ours
+        # mock over external module 'waffle.flag_is_active` not ours
 
         user = UserFactory()
         mock__get_current_user.return_value = user
@@ -48,7 +48,7 @@ def test_ember_flag_is_active_authenticated_user(self, mock_use_ember_app, mock_
     @mock.patch('website.ember_osf_web.decorators.flag_is_active')
     @mock.patch('website.ember_osf_web.decorators.use_ember_app')
     def test_ember_flag_is_active_unauthenticated_user(self, mock_use_ember_app, mock_flag_is_active, mock__get_current_user):
-        # mock over external module 'waflle.flag_is_active` not ours
+        # mock over external module 'waffle.flag_is_active` not ours
 
         ember_flag_is_active('active_flag')(self.mock_func)()
         group = Group.objects.create(name='foo')
diff --git a/tests/test_files/varnish.vcl b/tests/test_files/varnish.vcl
index fed8cf08248..4804bcd7744 100644
--- a/tests/test_files/varnish.vcl
+++ b/tests/test_files/varnish.vcl
@@ -33,7 +33,7 @@ backend server1 {
 
 	# 	.interval  = 5s; # check the health of each backend every 5 seconds
  #    	.timeout   = 1s; # timing out after 1 second.
- #    	.window    = 5;  # If 3 out of the last 5 polls succeeded the backend is considered healthy, otherwise it will be marked as sick
+ #    	.window    = 5;  # If 3 out of the last 5 polls succeeded the backend is considered healthy; otherwise, it will be marked as sick
  #    	.threshold = 3;
  #  	}
 
@@ -57,7 +57,7 @@ backend server1 {
 
 # 	# 	.interval  = 5s; # check the health of each backend every 5 seconds
 #  #    	.timeout   = 1s; # timing out after 1 second.
-#  #    	.window    = 5;  # If 3 out of the last 5 polls succeeded the backend is considered healthy, otherwise it will be marked as sick
+#  #    	.window    = 5;  # If 3 out of the last 5 polls succeeded the backend is considered healthy; otherwise, it will be marked as sick
 #  #    	.threshold = 3;
 #  #  	}
 
@@ -81,7 +81,7 @@ backend server1 {
 
 # 	# 	.interval  = 5s; # check the health of each backend every 5 seconds
 #  #    	.timeout   = 1s; # timing out after 1 second.
-#  #    	.window    = 5;  # If 3 out of the last 5 polls succeeded the backend is considered healthy, otherwise it will be marked as sick
+#  #    	.window    = 5;  # If 3 out of the last 5 polls succeeded the backend is considered healthy; otherwise, it will be marked as sick
 #  #    	.threshold = 3;
 #  #  	}
 
@@ -134,7 +134,7 @@ sub vcl_recv {
 
   	# Allow purging
 	if (req.method == "PURGE") {
-		if (!client.ip ~ purge) { # purge is the ACL defined at the begining
+		if (!client.ip ~ purge) { # purge is the ACL defined at the beginning
 			# Not from an allowed IP? Then die with an error.
 			return (synth(405, "This IP is not allowed to send PURGE requests."));
 		}
diff --git a/tests/test_metadata.py b/tests/test_metadata.py
index 5f81c35fc5c..fc1f6855d6e 100644
--- a/tests/test_metadata.py
+++ b/tests/test_metadata.py
@@ -21,7 +21,7 @@ def test_ensure_schemas(self):
 
         assert RegistrationSchema.objects.all().count() == len(OSF_META_SCHEMA_FILES)
 
-    def test_reigstrationschema_uniqueness_is_enforced_in_the_database(self):
+    def test_registrationschema_uniqueness_is_enforced_in_the_database(self):
         RegistrationSchema(name='foo', schema={'foo': 42}, schema_version=1).save()
         pytest.raises(ValidationError, RegistrationSchema(name='foo', schema={'bar': 24}, schema_version=1).save)
 
diff --git a/tests/test_notifications.py b/tests/test_notifications.py
index 49c6f1083d2..66002398513 100644
--- a/tests/test_notifications.py
+++ b/tests/test_notifications.py
@@ -158,7 +158,7 @@ def test_new_node_creator_is_not_subscribed_with_global_settings(self):
         assert len(user_subscriptions) == 1  # subscribed to only user settings
         assert 'global_file_updated' in event_types
 
-    def test_subscribe_user_to_global_notfiications(self):
+    def test_subscribe_user_to_global_notifications(self):
         user = factories.UserFactory()
         utils.subscribe_user_to_global_notifications(user)
         subscription_event_names = list(user.notification_subscriptions.values_list('event_name', flat=True))
@@ -1077,7 +1077,7 @@ def setUp(self):
         self.provider = factories.PreprintProviderFactory(_id='engrxiv')
         self.preprint = factories.PreprintFactory(provider=self.provider)
         self.submitter = factories.UserFactory()
-        self.moderator_transacitonal = factories.UserFactory()
+        self.moderator_transactional = factories.UserFactory()
         self.moderator_digest= factories.UserFactory()
 
         self.context_info_submission = {
@@ -1100,7 +1100,7 @@ def setUp(self):
 
         self.action = factories.ReviewActionFactory()
         self.subscription = NotificationSubscription.load(self.provider._id+'_new_pending_submissions')
-        self.subscription.add_user_to_subscription(self.moderator_transacitonal, 'email_transactional')
+        self.subscription.add_user_to_subscription(self.moderator_transactional, 'email_transactional')
         self.subscription.add_user_to_subscription(self.moderator_digest, 'email_digest')
 
     @mock.patch('website.notifications.emails.store_emails')
diff --git a/tests/test_pointer_views.py b/tests/test_pointer_views.py
index c3fdc6f875b..a8f3f6e5675 100644
--- a/tests/test_pointer_views.py
+++ b/tests/test_pointer_views.py
@@ -154,7 +154,7 @@ def test_add_the_same_pointer_more_than_once(self):
         )
         assert res.status_code == 400
 
-    def test_add_pointers_no_user_logg_in(self):
+    def test_add_pointers_no_user_log_in(self):
 
         url = self.project.api_url_for('add_pointers')
         node_ids = [
diff --git a/tests/test_preprints.py b/tests/test_preprints.py
index 13d44d362b5..da68e579df0 100644
--- a/tests/test_preprints.py
+++ b/tests/test_preprints.py
@@ -369,7 +369,7 @@ def test_cant_add_same_contributor_twice(self, preprint):
         preprint.save()
         assert len(preprint.contributors) == 2
 
-    def test_remove_unregistered_conributor_removes_unclaimed_record(self, preprint, auth):
+    def test_remove_unregistered_contributor_removes_unclaimed_record(self, preprint, auth):
         new_user = preprint.add_unregistered_contributor(fullname='David Davidson',
             email='david@davidson.com', auth=auth)
         preprint.save()
@@ -2701,6 +2701,38 @@ def test_preprint_version_withdrawal_request_post_mod(self, make_withdrawal_requ
         assert new_version.is_published is True
         assert new_version.machine_state == ReviewStates.WITHDRAWN.value
 
+    def test_date_created_first_version_with_rejected_v1(self, creator, moderator):
+        v1 = PreprintFactory(reviews_workflow='pre-moderation', is_published=False, creator=creator)
+        v1.run_submit(creator)
+        v1.run_reject(moderator, 'Rejecting v1')
+        v1.reload()
+
+        assert v1.machine_state == ReviewStates.REJECTED.value
+        assert v1.versioned_guids.first().is_rejected is True
+        v1_created = v1.created
+
+        v2 = PreprintFactory.create_version(
+            create_from=v1,
+            creator=creator,
+            final_machine_state='initial',
+            is_published=False,
+            set_doi=False
+        )
+        v2.run_submit(creator)
+        v2.run_accept(moderator, 'Accepting v2')
+        v2.reload()
+
+        assert v2.machine_state == ReviewStates.ACCEPTED.value
+        assert v2.is_published is True
+        v2_created = v2.created
+
+        assert v2_created > v1_created
+
+        assert v2.date_created_first_version == v1_created
+        assert v2.date_created_first_version != v2_created
+
+        assert v1.date_created_first_version == v1_created
+
 
 class TestEmberRedirect(OsfTestCase):
 
diff --git a/tests/test_project_contibutor_views.py b/tests/test_project_contributor_views.py
similarity index 99%
rename from tests/test_project_contibutor_views.py
rename to tests/test_project_contributor_views.py
index 4b33c890784..0dc4b95d9ff 100644
--- a/tests/test_project_contibutor_views.py
+++ b/tests/test_project_contributor_views.py
@@ -135,7 +135,7 @@ def test_can_view_nested_project_as_admin(self):
         url = self.child_project.web_url_for('view_project')
         res = self.app.get(url, auth=self.auth)
         assert 'Private Project' not in res.text
-        assert 'parent project'in res.text
+        assert 'parent project' in res.text
 
     def test_edit_description(self):
         self.app.post(
diff --git a/tests/test_project_views.py b/tests/test_project_views.py
index c43230c4887..16279d677d0 100644
--- a/tests/test_project_views.py
+++ b/tests/test_project_views.py
@@ -143,7 +143,7 @@ def test_can_view_nested_project_as_admin(self):
         url = self.child_project.web_url_for('view_project')
         res = self.app.get(url, auth=self.auth)
         assert 'Private Project' not in res.text
-        assert 'parent project'in res.text
+        assert 'parent project' in res.text
 
     def test_edit_description(self):
         self.app.post(
@@ -387,7 +387,7 @@ def test_fork_count_does_not_include_fork_registrations(self):
 
         url = project.api_url_for('view_project')
         res = self.app.get(url, auth=user.auth)
-        assert 'fork_count'in res.json['node']
+        assert 'fork_count' in res.json['node']
         assert 1 == res.json['node']['fork_count']
 
     def test_registration_retraction_redirect(self):
diff --git a/tests/test_registrations/test_retractions.py b/tests/test_registrations/test_retractions.py
index 22ee51827dd..62b7b77eac5 100644
--- a/tests/test_registrations/test_retractions.py
+++ b/tests/test_registrations/test_retractions.py
@@ -418,7 +418,7 @@ def setUp(self):
             title='Subcomponent'
         )
         self.registration = RegistrationFactory(project=self.project, is_public=True)
-        # Reload the registration; else tests won't catch failures to svae
+        # Reload the registration; else tests won't catch failures to save
         self.registration.reload()
 
     def test_approval_retracts_descendant_nodes(self):
@@ -565,7 +565,7 @@ def setUp(self):
         self.project = ProjectFactory(is_public=True, creator=self.user)
 
         self.registration = RegistrationFactory(project=self.project, is_public=True)
-        # Reload the registration; else tests won't catch failures to svae
+        # Reload the registration; else tests won't catch failures to save
         self.registration.reload()
 
     def test_approval_calls_share_hook(self):
diff --git a/tests/test_registrations/test_review_flows.py b/tests/test_registrations/test_review_flows.py
index a8653d32a0f..76257148cd6 100644
--- a/tests/test_registrations/test_review_flows.py
+++ b/tests/test_registrations/test_review_flows.py
@@ -153,7 +153,7 @@ def test_approve_after_reject_fails(self, sanction_object):
             sanction_object.approve(user=registration.creator, token=approval_token)
 
     @pytest.mark.parametrize('sanction_object', [registration_approval, embargo, retraction])
-    def test_reject_after_arpprove_fails(self, sanction_object):
+    def test_reject_after_approve_fails(self, sanction_object):
         # using fixtures in parametrize returns the function
         sanction_object = sanction_object()
         sanction_object.to_APPROVED()
diff --git a/tests/test_registrations/test_views.py b/tests/test_registrations/test_views.py
index 034b7b31ae4..34e95885da5 100644
--- a/tests/test_registrations/test_views.py
+++ b/tests/test_registrations/test_views.py
@@ -78,7 +78,7 @@ def test_is_public_node_register_page(self):
         assert res.status_code == http_status.HTTP_200_OK
 
     @mock.patch('framework.celery_tasks.handlers.enqueue_task', mock.Mock())
-    def test_register_template_page_backwards_comptability(self):
+    def test_register_template_page_backwards_compatibility(self):
         # Historically metaschema's were referenced by a slugified version
         # of their name.
         reg = self.draft.register(
@@ -531,7 +531,7 @@ def test_moderator_can_view_subpath_of_submitted_registration(
         resp = app.get(registration_subpath, auth=moderator.auth)
         assert resp.status_code == 200
 
-    def test_moderator_can_viw_subpath_of_embargoed_registration(
+    def test_moderator_can_view_subpath_of_embargoed_registration(
         self, app, embargoed_registration, moderator, registration_subpath):
         # Moderators may need to see details of an embargoed registration
         # to determine if there is a need to withdraw before it becomes public
diff --git a/tests/test_rubeus.py b/tests/test_rubeus.py
index ac359462974..5dfacc26bab 100644
--- a/tests/test_rubeus.py
+++ b/tests/test_rubeus.py
@@ -231,7 +231,7 @@ def test_private_components_not_shown(self):
         private_child = NodeFactory(parent=public_project, creator=user, is_public=False)
         public_grandchild = NodeFactory(parent=private_child, creator=user, is_public=True)
         private_greatgrandchild = NodeFactory(parent=public_grandchild, creator=user, is_public=False)
-        public_greatgreatgranchild = NodeFactory(parent=private_greatgrandchild, creator=user, is_public=True)
+        public_greatgreatgrandchild = NodeFactory(parent=private_greatgrandchild, creator=user, is_public=True)
 
         serializer = rubeus.NodeFileCollector(node=public_project, auth=Auth(user=UserFactory()))
         ret = serializer.to_hgrid()
@@ -244,8 +244,8 @@ def test_private_components_not_shown(self):
         assert public_grandchild.title == children[1]['name']
         assert False == children[1]['permissions']['edit']
 
-        assert public_greatgreatgranchild._id == children[1]['children'][1]['nodeID']
-        assert public_greatgreatgranchild.title == children[1]['children'][1]['name']
+        assert public_greatgreatgrandchild._id == children[1]['children'][1]['nodeID']
+        assert public_greatgreatgrandchild.title == children[1]['children'][1]['name']
         assert False == children[1]['children'][1]['permissions']['edit']
 
         assert 'Private Component' not in ret
diff --git a/tests/test_subjects.py b/tests/test_subjects.py
index 57c49f828f8..cd0b3dc6c91 100644
--- a/tests/test_subjects.py
+++ b/tests/test_subjects.py
@@ -58,7 +58,7 @@ def setUp(self):
         self.invalid_root_leaf = [self.outside_root._id, self.parent_subj_0._id, self.child_subj_00._id]
         self.invalid_ids = ['notarealsubjectid', 'thisisalsoafakeid']
 
-    def test_hiarachy_property(self):
+    def test_hierarchy_property(self):
         assert self.child_subj_00.hierarchy == [self.root_subject._id, self.parent_subj_0._id, self.child_subj_00._id]
         assert self.two_level_parent.hierarchy == [self.two_level_root._id, self.two_level_parent._id]
         assert self.one_level_root.hierarchy == [self.one_level_root._id]
diff --git a/tests/test_user_profile_view.py b/tests/test_user_profile_view.py
index 876acba9bf9..388195a3f46 100644
--- a/tests/test_user_profile_view.py
+++ b/tests/test_user_profile_view.py
@@ -740,4 +740,4 @@ def test_get_unconfirmed_emails_exclude_external_identity(self):
         self.user.save()
         unconfirmed_emails = self.user.get_unconfirmed_emails_exclude_external_identity()
         assert 'james@steward.com' in unconfirmed_emails
-        assert 'steward@james.com'not in unconfirmed_emails
+        assert 'steward@james.com' not in unconfirmed_emails
diff --git a/tests/test_utils.py b/tests/test_utils.py
index e1d43063e05..8fb60a89ade 100644
--- a/tests/test_utils.py
+++ b/tests/test_utils.py
@@ -437,7 +437,7 @@ class TestUserFactoryConflict:
 
     def test_build_create_user_time_conflict(self):
         # Test that build and create user factories do not create conflicting usernames
-        # because they occured quickly
+        # because they occurred quickly
         user_email_one = fake_email()
         user_email_two = fake_email()
         assert user_email_one != user_email_two
diff --git a/tests/test_webtests.py b/tests/test_webtests.py
index 43215e1ccec..6f6c719e59c 100644
--- a/tests/test_webtests.py
+++ b/tests/test_webtests.py
@@ -258,7 +258,7 @@ def setUp(self):
         self.consolidate_auth = Auth(user=self.user)
         self.project = ProjectFactory(creator=self.user)
         self.project.add_contributor(contributor=self.user, auth=self.consolidate_auth)
-        # A non-project componenet
+        # A non-project component
         self.component = NodeFactory(
             category='hypothesis',
             creator=self.user,
@@ -426,7 +426,7 @@ def setUp(self):
         self.auth = self.user.auth
         self.consolidate_auth = Auth(user=self.user)
         self.project = ProjectFactory(creator=self.user)
-        # A non-project componenet
+        # A non-project component
         self.component = NodeFactory(parent=self.project, category='hypothesis', creator=self.user)
         # Hack: Add some logs to component; should be unnecessary pending
         # improvements to factories from @rliebz
@@ -608,7 +608,7 @@ def test_cannot_remove_another_user_email(self):
         res = self.app.put(url, json=header, auth=user2.auth)
         assert res.status_code == 403
 
-    def test_cannnot_make_primary_email_for_another_user(self):
+    def test_cannot_make_primary_email_for_another_user(self):
         user1 = AuthUserFactory()
         user2 = AuthUserFactory()
         email = 'test@cos.io'
@@ -622,7 +622,7 @@ def test_cannnot_make_primary_email_for_another_user(self):
         res = self.app.put(url, json=header, auth=user2.auth)
         assert res.status_code == 403
 
-    def test_cannnot_add_email_for_another_user(self):
+    def test_cannot_add_email_for_another_user(self):
         user1 = AuthUserFactory()
         user2 = AuthUserFactory()
         email = 'test@cos.io'
@@ -1072,7 +1072,7 @@ def test_user_no_public_projects_or_components(self):
         # User has no public components/projects
         res = self.app.get(url, auth=self.me.auth)
         assert 'This user has no public projects' in res
-        assert 'This user has no public components'in res
+        assert 'This user has no public components' in res
 
     # regression test
     def test_does_not_show_registrations(self):
diff --git a/tests/utils.py b/tests/utils.py
index 6d5f934d8ba..086fb89ce96 100644
--- a/tests/utils.py
+++ b/tests/utils.py
@@ -225,7 +225,7 @@ def __init__(self, user):
 
 def unique(factory):
     """
-    Turns a factory function into a new factory function that guarentees unique return
+    Turns a factory function into a new factory function that guarantees unique return
     values. Note this uses regular item equivalence to check uniqueness, so this may not
     behave as expected with factories with complex return values.
 
@@ -240,7 +240,7 @@ def wrapper():
         over = 0
         while item in used:
             if over > 100:
-                raise RuntimeError('Tried 100 times to generate a unqiue value, stopping.')
+                raise RuntimeError('Tried 100 times to generate an unique value, stopping.')
             item = factory()
             over += 1
         used.append(item)
diff --git a/website/archiver/listeners.py b/website/archiver/listeners.py
index 5fb7924e2fa..6dd4f2dbd1b 100644
--- a/website/archiver/listeners.py
+++ b/website/archiver/listeners.py
@@ -12,7 +12,7 @@
 
 @project_signals.after_create_registration.connect
 def after_register(src, dst, user):
-    """Blinker listener for registration initiations. Enqueqes a chain
+    """Blinker listener for registration initiations. Enqueues a chain
     of archive tasks for the current node and its descendants
 
     :param src: Node being registered
diff --git a/website/archiver/tasks.py b/website/archiver/tasks.py
index 42e5bfb568b..a7c7d6c80ee 100644
--- a/website/archiver/tasks.py
+++ b/website/archiver/tasks.py
@@ -118,7 +118,7 @@ def on_failure(self, exc, task_id, args, kwargs, einfo):
         dst.save()
 
         sentry.log_message(
-            f'An error occured while archiving node: {src._id} and registration: {dst._id}',
+            f'An error occurred while archiving node: {src._id} and registration: {dst._id}',
             extra_data={
                 'source node guid': src._id,
                 'registration node guid': dst._id,
@@ -152,7 +152,7 @@ def stat_addon(addon_short_name, job_pk):
     :param job_pk: primary key of archive_job
     :return: AggregateStatResult containing file tree metadata
     """
-    # Dataverse reqires special handling for draft and
+    # Dataverse requires special handling for draft and
     # published content
     addon_name = addon_short_name
     version = None
@@ -236,7 +236,7 @@ def archive_addon(addon_short_name, job_pk):
     params = {'cookie': cookie}
     rename_suffix = ''
     # The dataverse API will not differentiate between published and draft files
-    # unless expcicitly asked. We need to create seperate folders for published and
+    # unless explicitly asked. We need to create separate folders for published and
     # draft in the resulting archive.
     #
     # Additionally trying to run the archive without this distinction creates a race
@@ -341,7 +341,7 @@ def archive_success(self, dst_pk, job_pk):
     notes about utils.get_file_map: 1) this function memoizes previous results to reduce
     overhead and 2) this function returns a generator that lazily fetches the file metadata
     of child Nodes (it is possible for a selected file to belong to a child Node) using a
-    non-recursive DFS. Combined this allows for a relatively effient implementation with
+    non-recursive DFS. Combined this allows for a relatively efficient implementation with
     seemingly redundant calls.
     """
     create_app_context()
diff --git a/website/archiver/utils.py b/website/archiver/utils.py
index 44cd7517413..989c3d28909 100644
--- a/website/archiver/utils.py
+++ b/website/archiver/utils.py
@@ -160,7 +160,7 @@ def aggregate_file_tree_metadata(addon_short_name, fileobj_metadata, user):
     :param src_addon: AddonNodeSettings instance of addon being examined
     :param fileobj_metadata: file or folder metadata of current point of reference
     in file tree
-    :param user: archive initatior
+    :param user: archive initiator
     :return: top-most recursive call returns AggregateStatResult containing addon file tree metadata
     """
     disk_usage = fileobj_metadata.get('size')
@@ -217,7 +217,7 @@ def wrapper(node):
 @_memoize_get_file_map
 def get_file_map(node, file_map):
     """
-    note:: file_map is injected implictly by the decorator; this method is called like:
+    note:: file_map is injected implicitly by the decorator; this method is called like:
 
     get_file_map(node)
     """
diff --git a/website/citations/providers.py b/website/citations/providers.py
index 96b6dd461a6..9965bfc1d9b 100644
--- a/website/citations/providers.py
+++ b/website/citations/providers.py
@@ -88,7 +88,7 @@ def provider_name(self):
         pass
 
     def check_credentials(self, node_addon):
-        """Checkes validity of credentials"""
+        """Checks validity of credentials"""
         valid = True
         if node_addon.api.account:
             try:
@@ -170,7 +170,7 @@ def remove_user_auth(self, node_addon, user):
         return {'result': result}
 
     def widget(self, node_addon):
-        """Serializes settting needed to build the widget"""
+        """Serializes setting needed to build the widget"""
         ret = node_addon.config.to_json()
         ret.update({
             'complete': node_addon.complete,
diff --git a/website/citations/views.py b/website/citations/views.py
index 649f941a8bf..43c564be237 100644
--- a/website/citations/views.py
+++ b/website/citations/views.py
@@ -177,7 +177,7 @@ def widget(self):
         @must_be_contributor_or_public
         @must_have_addon(addon_short_name, 'node')
         def _widget(node_addon, **kwargs):
-            """ Collects and serializes settting needed to build the widget
+            """ Collects and serializes setting needed to build the widget
             """
             return Provider().widget(node_addon)
 
diff --git a/website/conferences/message.py b/website/conferences/message.py
index 56325bfb06b..a5397462a34 100644
--- a/website/conferences/message.py
+++ b/website/conferences/message.py
@@ -136,7 +136,7 @@ def sender_display(self):
     def route(self):
         match = re.search(re.compile(BASE_REGEX.format(allowed_types=(self.allowed_types or 'poster|talk')), re.IGNORECASE | re.VERBOSE), self.form['recipient'])
         if not match:
-            # removed format as it was doing nothing if it is indedeed needed, use git blame
+            # removed format as it was doing nothing if it is indeed needed, use git blame
             raise ConferenceError('Invalid recipient:')
         data = match.groupdict()
         if bool(settings.DEV_MODE) != bool(data['test']):
diff --git a/website/ember_osf_web/decorators.py b/website/ember_osf_web/decorators.py
index 978445f2bf3..6b939312ee2 100644
--- a/website/ember_osf_web/decorators.py
+++ b/website/ember_osf_web/decorators.py
@@ -9,7 +9,7 @@
 def ember_flag_is_active(flag_name):
     """
     Decorator for checking whether ember flag is active.  If so, proxy to ember
-    app, otherwise, load old view.
+    app; otherwise, load old view.
     """
     def decorator(func):
         @functools.wraps(func)
diff --git a/website/language.py b/website/language.py
index 80936924e6a..8c39d97b704 100644
--- a/website/language.py
+++ b/website/language.py
@@ -57,9 +57,8 @@
 
 REGISTRATION_SUCCESS = """Registration successful. Please check {email} to confirm your email address."""
 
-EXTERNAL_LOGIN_EMAIL_CREATE_SUCCESS = """A new OSF account has been created with your {external_id_provider} profile. Please check {email} to confirm your email address."""
-
-EXTERNAL_LOGIN_EMAIL_LINK_SUCCESS = """Your OSF account has been linked with your {external_id_provider}. Please check {email} to confirm this action."""
+EXTERNAL_LOGIN_EMAIL_CREATE_SUCCESS = """Hello {fullname}, a new OSF account has been created with your {external_id_provider} profile. Please check {email} to confirm your email address."""
+EXTERNAL_LOGIN_EMAIL_LINK_SUCCESS = """Hello {fullname}, your OSF account has been linked with your {external_id_provider}. Please check {email} to confirm this action."""
 
 # Shown if registration is turned off in website.settings
 REGISTRATION_UNAVAILABLE = 'Registration currently unavailable.'
@@ -71,7 +70,7 @@
 
 # Shown if user tries to login with an email that is not yet confirmed
 UNCONFIRMED = ('This login email has been registered but not confirmed. Please check your email (and spam folder).'
-               ' <a href="/resend/">Click here</a> to resend your confirmation email.')
+               ' You can <a href="/resend/">resend your confirmation email</a>.')
 
 # Shown if the user's account is disabled
 DISABLED = """
diff --git a/website/notifications/emails.py b/website/notifications/emails.py
index d26d43351d5..e61c64e660a 100644
--- a/website/notifications/emails.py
+++ b/website/notifications/emails.py
@@ -200,11 +200,11 @@ def get_settings_url(uid, user):
         return web_url_for('user_notifications', _absolute=True)
 
     node = AbstractNode.load(uid)
-    assert node, 'get_settings_url recieved an invalid Node id'
+    assert node, 'get_settings_url received an invalid Node id'
     return node.web_url_for('node_setting', _guid=True, _absolute=True)
 
 def fix_locale(locale):
-    """Atempt to fix a locale to have the correct casing, e.g. de_de -> de_DE
+    """Attempt to fix a locale to have the correct casing, e.g. de_de -> de_DE
 
     This is NOT guaranteed to return a valid locale identifier.
     """
diff --git a/website/profile/views.py b/website/profile/views.py
index c4d49147454..8e66e9341e0 100644
--- a/website/profile/views.py
+++ b/website/profile/views.py
@@ -77,7 +77,7 @@ def resend_confirmation(auth):
         raise HTTPError(http_status.HTTP_400_BAD_REQUEST)
 
     if primary or confirmed:
-        raise HTTPError(http_status.HTTP_400_BAD_REQUEST, data={'message_long': 'Cannnot resend confirmation for confirmed emails'})
+        raise HTTPError(http_status.HTTP_400_BAD_REQUEST, data={'message_long': 'Cannot resend confirmation for confirmed emails'})
 
     user.add_unconfirmed_email(address)
 
diff --git a/website/project/metadata/brandt-prereg-2.json b/website/project/metadata/brandt-prereg-2.json
index 94f81ebc313..74788baed5d 100644
--- a/website/project/metadata/brandt-prereg-2.json
+++ b/website/project/metadata/brandt-prereg-2.json
@@ -28,7 +28,7 @@
             "type": "string",
             "format": "text",
             "title": "The confidence interval of the original effect is",
-            "nav": "Original confidence iterval"
+            "nav": "Original confidence interval"
         }, {
             "qid": "item5",
             "type": "string",
diff --git a/website/project/metadata/egap-legacy-registration.json b/website/project/metadata/egap-legacy-registration.json
index 438af17e5a9..3a0f0576a95 100644
--- a/website/project/metadata/egap-legacy-registration.json
+++ b/website/project/metadata/egap-legacy-registration.json
@@ -145,7 +145,7 @@
 					"title": "Background and explanation of rationale.",
 					"format": "textarea",
 					"required": true,
-					"description": "Brief description of goals of project. If you are also attaching a pre-analysis plan, please refrain from simply copying and pasting a section from your plan here. If possible, please also avoid saying \"see attached pre-analysis plan,\" as it renders the search functionality less useful. Rather, please provide a short (1-2 paragraph) summary of the project background."
+					"description": "Brief description of goals of project. If you are also attaching a pre-analysis plan, please refrain from simply copying and pasting a section from your plan here. If possible, please avoid saying \"see attached pre-analysis plan,\" as it renders the search functionality less useful. Rather, please provide a short (1-2 paragraph) summary of the project background."
 				},
 				{
 					"qid": "q16",
@@ -153,7 +153,7 @@
 					"title": "What are the hypotheses to be tested/quantities of interest to be estimated?",
 					"format": "textarea",
 					"required": true,
-					"description": "Please list the hypotheses including hypotheses on heterogeneous effects. If you are also attaching a pre-analysis plan, please refrain from simply copying and pasting a section from your plan here. If possible, please also avoid saying \"see attached pre-analysis plan,\" as it renders the search functionality less useful. Rather, please provide a short (1-2 paragraph) summary of project hypotheses."
+					"description": "Please list the hypotheses including hypotheses on heterogeneous effects. If you are also attaching a pre-analysis plan, please refrain from simply copying and pasting a section from your plan here. If possible, please avoid saying \"see attached pre-analysis plan,\" as it renders the search functionality less useful. Rather, please provide a short (1-2 paragraph) summary of project hypotheses."
 				},
 				{
 					"qid": "q17",
@@ -161,7 +161,7 @@
 					"title": "How will these hypotheses be tested?",
 					"format": "textarea",
 					"required": true,
-					"description": "Brief description of your methodology. If you are also attaching a pre-analysis plan, please refrain from simply copying and pasting a section from your plan here. If possible, please also avoid saying \"see attached pre-analysis plan,\" as it renders the search functionality less useful. Rather, please provide a short (1-2 paragraph) summary of project methodology."
+					"description": "Brief description of your methodology. If you are also attaching a pre-analysis plan, please refrain from simply copying and pasting a section from your plan here. If possible, please avoid saying \"see attached pre-analysis plan,\" as it renders the search functionality less useful. Rather, please provide a short (1-2 paragraph) summary of project methodology."
 				},
 				{
 					"qid": "q18",
@@ -340,7 +340,7 @@
 				"nav": "Certification",
 				"type": "choose",
 				"format": "singleselect",
-				"description": "By submitting this form and accompanying documents with EGAP, I confirm that I have rights to put this information in the public domain and I understand that this information will remain on the EGAP registry in perpetuity, regardless of whether the research is subsequently implemented or not.",
+				"description": "By submitting this form and accompanying documents with EGAP, I confirm that I have rights to put this information in the public domain and I understand that this information will remain on the EGAP registry in perpetuity, regardless of whether or not the research is subsequently implemented.",
 				"options": [
 					"Agree"
 				],
diff --git a/website/project/metadata/egap-project-2.json b/website/project/metadata/egap-project-2.json
index 66fb29f16e9..9ee68704292 100644
--- a/website/project/metadata/egap-project-2.json
+++ b/website/project/metadata/egap-project-2.json
@@ -54,7 +54,7 @@
             "description": "Describe formal tests"
         }, {
             "qid": "yesno1",
-            "title": "Has this research received Insitutional Review Board (IRB) or ethics committee approval?",
+            "title": "Has this research received Institutional Review Board (IRB) or ethics committee approval?",
             "type": "choose",
             "options": ["Yes", "No"]
         }, {
diff --git a/website/project/metadata/egap-registration-3.json b/website/project/metadata/egap-registration-3.json
index ef72137c049..f03724d02a3 100644
--- a/website/project/metadata/egap-registration-3.json
+++ b/website/project/metadata/egap-registration-3.json
@@ -145,7 +145,7 @@
 					"title": "Background and explanation of rationale.",
 					"format": "textarea",
 					"required": true,
-					"description": "Brief description of goals of project. If you are also attaching a pre-analysis plan, please refrain from simply copying and pasting a section from your plan here. If possible, please also avoid saying \"see attached pre-analysis plan,\" as it renders the search functionality less useful. Rather, please provide a short (1-2 paragraph) summary of the project background."
+					"description": "Brief description of goals of project. If you are also attaching a pre-analysis plan, please refrain from simply copying and pasting a section from your plan here. If possible, please avoid saying \"see attached pre-analysis plan,\" as it renders the search functionality less useful. Rather, please provide a short (1-2 paragraph) summary of the project background."
 				},
 				{
 					"qid": "q16",
@@ -153,7 +153,7 @@
 					"title": "What are the hypotheses to be tested/quantities of interest to be estimated?",
 					"format": "textarea",
 					"required": true,
-					"description": "Please list the hypotheses including hypotheses on heterogeneous effects. If you are also attaching a pre-analysis plan, please refrain from simply copying and pasting a section from your plan here. If possible, please also avoid saying \"see attached pre-analysis plan,\" as it renders the search functionality less useful. Rather, please provide a short (1-2 paragraph) summary of project hypotheses."
+					"description": "Please list the hypotheses including hypotheses on heterogeneous effects. If you are also attaching a pre-analysis plan, please refrain from simply copying and pasting a section from your plan here. If possible, please avoid saying \"see attached pre-analysis plan,\" as it renders the search functionality less useful. Rather, please provide a short (1-2 paragraph) summary of project hypotheses."
 				},
 				{
 					"qid": "q17",
@@ -161,7 +161,7 @@
 					"title": "How will these hypotheses be tested?",
 					"format": "textarea",
 					"required": true,
-					"description": "Brief description of your methodology. If you are also attaching a pre-analysis plan, please refrain from simply copying and pasting a section from your plan here. If possible, please also avoid saying \"see attached pre-analysis plan,\" as it renders the search functionality less useful. Rather, please provide a short (1-2 paragraph) summary of project methodology."
+					"description": "Brief description of your methodology. If you are also attaching a pre-analysis plan, please refrain from simply copying and pasting a section from your plan here. If possible, please avoid saying \"see attached pre-analysis plan,\" as it renders the search functionality less useful. Rather, please provide a short (1-2 paragraph) summary of project methodology."
 				},
 				{
 					"qid": "q18",
@@ -340,7 +340,7 @@
 				"nav": "Certification",
 				"type": "choose",
 				"format": "singleselect",
-				"description": "By submitting this form and accompanying documents with EGAP, I confirm that I have rights to put this information in the public domain and I understand that this information will remain on the EGAP registry in perpetuity, regardless of whether the research is subsequently implemented or not.",
+				"description": "By submitting this form and accompanying documents with EGAP, I confirm that I have rights to put this information in the public domain and I understand that this information will remain on the EGAP registry in perpetuity, regardless of whether or not the research is subsequently implemented.",
 				"options": [
 					"Agree"
 				],
diff --git a/website/project/metadata/egap-registration-4.json b/website/project/metadata/egap-registration-4.json
index 7886587ca02..195f7bac471 100644
--- a/website/project/metadata/egap-registration-4.json
+++ b/website/project/metadata/egap-registration-4.json
@@ -131,7 +131,7 @@
 					"title": "Background and explanation of rationale.",
 					"format": "textarea",
 					"required": true,
-					"description": "Brief description of goals of project. If you are also attaching a pre-analysis plan, please refrain from simply copying and pasting a section from your plan here. If possible, please also avoid saying \"see attached pre-analysis plan,\" as it renders the search functionality less useful. Rather, please provide a short (1-2 paragraph) summary of the project background."
+					"description": "Brief description of goals of project. If you are also attaching a pre-analysis plan, please refrain from simply copying and pasting a section from your plan here. If possible, please avoid saying \"see attached pre-analysis plan,\" as it renders the search functionality less useful. Rather, please provide a short (1-2 paragraph) summary of the project background."
 				},
 				{
 					"qid": "q16",
@@ -139,7 +139,7 @@
 					"title": "What are the hypotheses to be tested/quantities of interest to be estimated?",
 					"format": "textarea",
 					"required": true,
-					"description": "Please list the hypotheses including hypotheses on heterogeneous effects. If you are also attaching a pre-analysis plan, please refrain from simply copying and pasting a section from your plan here. If possible, please also avoid saying \"see attached pre-analysis plan,\" as it renders the search functionality less useful. Rather, please provide a short (1-2 paragraph) summary of project hypotheses."
+					"description": "Please list the hypotheses including hypotheses on heterogeneous effects. If you are also attaching a pre-analysis plan, please refrain from simply copying and pasting a section from your plan here. If possible, please avoid saying \"see attached pre-analysis plan,\" as it renders the search functionality less useful. Rather, please provide a short (1-2 paragraph) summary of project hypotheses."
 				},
 				{
 					"qid": "q17",
@@ -147,7 +147,7 @@
 					"title": "How will these hypotheses be tested?",
 					"format": "textarea",
 					"required": true,
-					"description": "Brief description of your methodology. If you are also attaching a pre-analysis plan, please refrain from simply copying and pasting a section from your plan here. If possible, please also avoid saying \"see attached pre-analysis plan,\" as it renders the search functionality less useful. Rather, please provide a short (1-2 paragraph) summary of project methodology."
+					"description": "Brief description of your methodology. If you are also attaching a pre-analysis plan, please refrain from simply copying and pasting a section from your plan here. If possible, please avoid saying \"see attached pre-analysis plan,\" as it renders the search functionality less useful. Rather, please provide a short (1-2 paragraph) summary of project methodology."
 				},
 				{
 					"qid": "q18",
@@ -326,7 +326,7 @@
 				"nav": "Certification",
 				"type": "choose",
 				"format": "singleselect",
-				"description": "By submitting this form and accompanying documents with EGAP, I confirm that I have rights to put this information in the public domain and I understand that this information will remain on the EGAP registry in perpetuity, regardless of whether the research is subsequently implemented or not.",
+				"description": "By submitting this form and accompanying documents with EGAP, I confirm that I have rights to put this information in the public domain and I understand that this information will remain on the EGAP registry in perpetuity, regardless of whether or not the research is subsequently implemented.",
 				"options": [
 					"Agree"
 				],
diff --git a/website/project/metadata/egap-registration.json b/website/project/metadata/egap-registration.json
index 13ec25b6ce8..f924971a3df 100644
--- a/website/project/metadata/egap-registration.json
+++ b/website/project/metadata/egap-registration.json
@@ -153,7 +153,7 @@
 					"title": "Background and explanation of rationale.",
 					"format": "textarea",
 					"required": true,
-					"description": "Brief description of goals of project. If you are also attaching a pre-analysis plan, please refrain from simply copying and pasting a section from your plan here. If possible, please also avoid saying \"see attached pre-analysis plan,\" as it renders the search functionality less useful. Rather, please provide a short (1-2 paragraph) summary of the project background."
+					"description": "Brief description of goals of project. If you are also attaching a pre-analysis plan, please refrain from simply copying and pasting a section from your plan here. If possible, please avoid saying \"see attached pre-analysis plan,\" as it renders the search functionality less useful. Rather, please provide a short (1-2 paragraph) summary of the project background."
 				},
 				{
 					"qid": "q16",
@@ -161,7 +161,7 @@
 					"title": "What are the hypotheses to be tested/quantities of interest to be estimated?",
 					"format": "textarea",
 					"required": true,
-					"description": "Please list the hypotheses including hypotheses on heterogeneous effects. If you are also attaching a pre-analysis plan, please refrain from simply copying and pasting a section from your plan here. If possible, please also avoid saying \"see attached pre-analysis plan,\" as it renders the search functionality less useful. Rather, please provide a short (1-2 paragraph) summary of project hypotheses."
+					"description": "Please list the hypotheses including hypotheses on heterogeneous effects. If you are also attaching a pre-analysis plan, please refrain from simply copying and pasting a section from your plan here. If possible, please avoid saying \"see attached pre-analysis plan,\" as it renders the search functionality less useful. Rather, please provide a short (1-2 paragraph) summary of project hypotheses."
 				},
 				{
 					"qid": "q17",
@@ -169,7 +169,7 @@
 					"title": "How will these hypotheses be tested?",
 					"format": "textarea",
 					"required": true,
-					"description": "Brief description of your methodology. If you are also attaching a pre-analysis plan, please refrain from simply copying and pasting a section from your plan here. If possible, please also avoid saying \"see attached pre-analysis plan,\" as it renders the search functionality less useful. Rather, please provide a short (1-2 paragraph) summary of project methodology."
+					"description": "Brief description of your methodology. If you are also attaching a pre-analysis plan, please refrain from simply copying and pasting a section from your plan here. If possible, please avoid saying \"see attached pre-analysis plan,\" as it renders the search functionality less useful. Rather, please provide a short (1-2 paragraph) summary of project methodology."
 				},
 				{
 					"qid": "q18",
@@ -343,7 +343,7 @@
 				"nav": "Certification",
 				"type": "choose",
 				"format": "singleselect",
-				"description": "By submitting this form and accompanying documents with EGAP, I confirm that I have rights to put this information in the public domain and I understand that this information will remain on the EGAP registry in perpetuity, regardless of whether the research is subsequently implemented or not.",
+				"description": "By submitting this form and accompanying documents with EGAP, I confirm that I have rights to put this information in the public domain and I understand that this information will remain on the EGAP registry in perpetuity, regardless of whether or not the research is subsequently implemented.",
 				"options": [
 					"Agree"
 				],
diff --git a/website/project/metadata/global-flourishing-preregistration.json b/website/project/metadata/global-flourishing-preregistration.json
index 4eb4f7d85a1..9d00c5fa87f 100644
--- a/website/project/metadata/global-flourishing-preregistration.json
+++ b/website/project/metadata/global-flourishing-preregistration.json
@@ -154,7 +154,7 @@
       },
       {
          "block_type":"question-label",
-         "display_text":"Additoinal Information",
+         "display_text":"Additional Information",
          "help_text":"If there is any additional information that you feel needs to be included in your preregistration, please enter it here. Literature cited, disclosures of any related work such as replications or work that uses the same data, or other context that will be helpful for future readers would be appropriate here. \n"
       },
       {
diff --git a/website/project/metadata/global-flourishing.json b/website/project/metadata/global-flourishing.json
index 84fb5fe9628..e3fe8a6e03f 100644
--- a/website/project/metadata/global-flourishing.json
+++ b/website/project/metadata/global-flourishing.json
@@ -123,7 +123,7 @@
       {
          "block_type":"question-label",
          "display_text":"Outliers",
-         "help_text":"If you plan to remove outliers, how will you define what a statistical outlier is in your data? Please also provide a new expected sample size, if appropriate.\n",
+         "help_text":"If you plan to remove outliers, how will you define what a statistical outlier is in your data? Please provide a new expected sample size, if appropriate.\n",
          "registration_response_key":""
       },
       {
diff --git a/website/project/metadata/hypothesis-testing-studies-using-youth-data.json b/website/project/metadata/hypothesis-testing-studies-using-youth-data.json
index bc0399b9d27..7c6ee794c85 100644
--- a/website/project/metadata/hypothesis-testing-studies-using-youth-data.json
+++ b/website/project/metadata/hypothesis-testing-studies-using-youth-data.json
@@ -69,7 +69,7 @@
             "block_type": "question-label",
             "example_text": "The following example is shortened. Please see https://psyarxiv.com/hvfmr/ for complete details.\n\nReligiosity (IV): Religiosity is measured using a newly created scale with a subset of items from the Religion and Spirituality module of the 2004 mail survey. The scale includes general questions about how religious/spiritual the individual is and how important religion/spirituality is to them. The specific variables are as follows:\n\nil001rer: How religious are you?\nil002rer: How spiritual are you?\nil003rer: How important is religion in your life?\nil004rer: How important is spirituality in your life?\nil005rer: How important was it, or would it have been if you had children, to send your children for religious or spiritual instruction?\nil006rer: How closely do you identify with being a member of a religious group?\n\nThe levels of all of these variables are indicated by a Likert scale with the following options: (1) Not at all; (2) Not very; (3) Somewhat; (4) Very; (5) Extremely, as well as ‘System Missing’ (the participant did not provide an answer) and ‘Refused’ (the participant refused to answer the question). Variable il006rer additionally includes the option ‘Don’t know’ (the participant stated that they did not know how to answer the question). We will use the average score (after omitting non-numeric and ‘Don’t know’ responses) on the variables as a measure of religiosity. \n\nProsociality (DV): We will use three measures of prosociality that measure three aspects of engagement in other oriented activities. The prosociality variables come from the Volunteering module of the 2004 phone survey. \n\ngv103re: Did the graduate do volunteer work in the last 12 months? \n\nThis dichotomous variable assesses whether or not the participant has engaged in any volunteering activities in the last 12 months. The levels of this variable are yes/no. Yes will be coded as ‘1’, no will be coded as ‘0’.",
             "display_text": "Variables",
-            "help_text": "Describe all variables that will be used as IVs (predictors), DVs (outcomes), or covariates in your study. Label them accordingly. If you are using a scale or an index, state the construct the scale/index represents, which items the scale/index will consist of, and how these items will be aggregated. When the aggregation is based on exploratory factor analysis (EFA) or confirmatory factor analysis (CFA), also specify the relevant details (EFA: rotation, how the number of factors will be determined, how best fit will be selected, CFA: how loadings will be specified, how fit will be assessed, which residuals variance terms will be correlated). If you are using any categorical variables, state how you will code them in the statistical analyses."
+            "help_text": "Describe all variables that will be used as IVs (predictors), DVs (outcomes), or covariates in your study. Label them accordingly. If you are using a scale or an index, state the construct that the scale/index represents, which items the scale/index will consist of, and how these items will be aggregated. When the aggregation is based on exploratory factor analysis (EFA) or confirmatory factor analysis (CFA), also specify the relevant details (EFA: rotation, how the number of factors will be determined, how best fit will be selected, CFA: how loadings will be specified, how fit will be assessed, which residuals variance terms will be correlated). If you are using any categorical variables, state how you will code them in the statistical analyses."
         },
         {
             "block_type": "long-text-input",
diff --git a/website/project/metadata/other-studies-using-youth-data.json b/website/project/metadata/other-studies-using-youth-data.json
index e9b58894602..863f7ebd0bd 100644
--- a/website/project/metadata/other-studies-using-youth-data.json
+++ b/website/project/metadata/other-studies-using-youth-data.json
@@ -37,7 +37,7 @@
         {
             "block_type": "question-label",
             "display_text": "Upload any files or supporting materials",
-            "help_text": "Upload the data request form output pdf file here. \n\nAlso upload any supporting materials that help describe the studiy design, goals, methodology approach, analysis plan, data processing, etc. "
+            "help_text": "Upload the data request form output pdf file here. \n\nAlso upload any supporting materials that help describe the study design, goals, methodology approach, analysis plan, data processing, etc. "
         },
         {
             "block_type": "file-input"
diff --git a/website/project/metadata/prereg-prize.json b/website/project/metadata/prereg-prize.json
index 780b485a9f0..72c2f084dca 100644
--- a/website/project/metadata/prereg-prize.json
+++ b/website/project/metadata/prereg-prize.json
@@ -12,7 +12,7 @@
         "requiresConsent": true,
         "messages": {
             "beforeSkipReview": "You are about to register your project without having its content reviewed. This preregistration will NOT BE ELIGIBLE for the Preregistration Challenge. You may click “Continue” to register your project or “Cancel” to return to the form and then “Submit for review” to enter the Preregistration Challenge.",
-            "preConsentHeader": "<div class='text-center m-t-lg'><h3>Preregistration Challenge </h3><hr><h2> Notice </h2></div><div class='row m-t-xl'><div class='col-lg-10 col-lg-offset-1'><p><strong> Articles must be published by an <a target='_blank' href='http://cos.io/our-services/prereg-more-information/'>approved</a> journal by December 31, 2018, to be eligible for a prize. </strong></p><p> Below are some important items for those who choose to enter the Preregistration Challenge. If you do not agree to the terms you may still continue, use the form, and register your research study without entering the Challenge. <strong>Only Preregistrations that enter the challenge and undergo review are eligible for a $1,000 prize. </strong>We welcome questions and comments (learn more <a target='_blank' href='https://cos.io/prereg'>here</a> or email us at <a href='mailto:prereg@cos.io'>prereg@cos.io</a>).</p>",
+            "preConsentHeader": "<div class='text-center m-t-lg'><h3>Preregistration Challenge </h3><hr><h2> Notice </h2></div><div class='row m-t-xl'><div class='col-lg-10 col-lg-offset-1'><p><strong> Articles must be published by an <a target='_blank' href='http://cos.io/our-services/prereg-more-information/'>approved</a> journal by December 31, 2018, to be eligible for a prize. </strong></p><p> Below are some important items for those who choose to enter the Preregistration Challenge. If you do not agree to the terms you may still continue, use the form, and register your research study without entering the Challenge. <strong>Only Preregistrations that enter the challenge and undergo review are eligible for a $1,000 prize. </strong>We welcome  <a target='_blank' href='https://cos.io/prereg'>questions and comments</a> or email us at <a href='mailto:prereg@cos.io'>prereg@cos.io</a>).</p>",
             "postConsentHeader": "<div class='text-center m-t-lg'><h3>Preregistration Challenge </h3><hr><h2> Notice of Consent </h2></div><div class='row m-t-xl'><div class='col-lg-10 col-lg-offset-1'><p><strong> Articles must be published by an <a target='_blank' href='http://cos.io/our-services/prereg-more-information/'>approved</a> journal by December 31, 2018, to be eligible for a prize. </strong></p><p>Please read and agree to the terms before submitting your research plan to the Preregistration Challenge.</p>",
             "consentBody": "<ol id='consentList'> <li>After submitting your research plan for review, it is not yet registered. Your research plan will become a static, time stamped preregistration after it passes review. <strong>Please do not begin your study until it is registered.</strong> You will hear back from the review team within 2 business days.</li><li>The published article must also be reviewed before receiving the prize.</li><li>Prizes will be awarded at predetermined dates to eligible entrants. If more eligible entrants exist than available prizes, entrants will be ranked based on the date of registration.</li><li>Articles must be published in an <a target='_blank' href='https://cos.io/preregjournals'> eligible journal.</a></li><li>Residents of countries on the U.S. State Department's <a target='_blank' href='https://www.pmddtc.state.gov/?id=ddtc_public_portal_country_landing'>list of embargoed countries</a> may not participate in the Preregistration Challenge.</li><li>Entering the Preregistration Challenge requires that you agree to <a target='_blank' href='https://osf.io/4uxbj/'>all of its terms.</a></li></ol></div></div>"
         },
@@ -275,7 +275,7 @@
         "id": "page5",
         "title": "Analysis Plan",
         "type": "object",
-        "description": "You may describe one or more confirmatory analysis in this preregistration. Please remember that all analyses specified below must be reported in the final article, and any additional analyses must be noted as exploratory or hypothesis-generating.<br /><br />A confirmatory analysis plan must state up front which variables are predictors (independent) and which are the outcomes (dependent), otherwise it is an exploratory analysis. You are allowed to describe any exploratory work here, but a clear confirmatory analysis is required.",
+        "description": "You may describe one or more confirmatory analysis in this preregistration. Please remember that all analyses specified below must be reported in the final article, and any additional analyses must be noted as exploratory or hypothesis-generating.<br /><br />A confirmatory analysis plan must state up front which variables are predictors (independent) and which are the outcomes (dependent); otherwise, it is an exploratory analysis. You are allowed to describe any exploratory work here, but a clear confirmatory analysis is required.",
         "questions": [{
             "qid": "q19",
             "nav": "Statistical models",
@@ -310,7 +310,7 @@
             "nav": "Follow-up analyses",
             "title": "Follow-up analyses",
             "description": "If not specified previously, will you be conducting any confirmatory analyses to follow up on effects in your statistical model, such as subgroup analyses, pairwise or complex contrasts, or follow-up tests from interactions? Remember that any analyses not specified in this research plan must be noted as exploratory.",
-            "help": "If the the ANOVA indicates that the mean taste perceptions are significantly different (p<.05), then we will use a Tukey-Kramer HSD test to conduct all possible pairwise comparison.<br /><br /> How responses will be evaluated: This is simply a place to allow entering in any additional analyses. The criteria for these follow up analyses are identical to any analyses listed in other sections. It is also fine to enter these follow up analyses in a separate analysis section. The purpose of this question is to allow entering of any follow up tests that naturally follow from a primary analysis.",
+            "help": "If the ANOVA indicates that the mean taste perceptions are significantly different (p<.05), then we will use a Tukey-Kramer HSD test to conduct all possible pairwise comparison.<br /><br /> How responses will be evaluated: This is simply a place to allow entering in any additional analyses. The criteria for these follow up analyses are identical to any analyses listed in other sections. It is also fine to enter these follow up analyses in a separate analysis section. The purpose of this question is to allow entering of any follow up tests that naturally follow from a primary analysis.",
             "required": true,
             "type": "string",
             "format": "textarea"
diff --git a/website/project/metadata/real-world-evidence-2.json b/website/project/metadata/real-world-evidence-2.json
index e536f6e5cdc..51c4127e309 100644
--- a/website/project/metadata/real-world-evidence-2.json
+++ b/website/project/metadata/real-world-evidence-2.json
@@ -211,7 +211,7 @@
 		"help_text": "To improve explanatory power, one may want to model pre-exposure patient characteristics that are risk factors for the study outcome. To reduce confounding in the absence of baseline randomization one may want to adjust for patient characteristics that are also associated exposure.",
 		"block_type": "question-label",
 		"display_text": "Patient Characteristics to be used in the analysis",
-		"example_text": "Age, sex, pre-existing dementia, BMI, Hb A1c measurement, \u2026..",
+		"example_text": "Age, sex, preexisting dementia, BMI, Hb A1c measurement, \u2026..",
 		"required": false
 	}, {
 		"help_text": "",
diff --git a/website/project/metadata/real-world-evidence.json b/website/project/metadata/real-world-evidence.json
index 7a67c1b38ca..57812437919 100644
--- a/website/project/metadata/real-world-evidence.json
+++ b/website/project/metadata/real-world-evidence.json
@@ -154,7 +154,7 @@
                "format":"textarea",
                "title":"Patient Characteristics to be used in the analysis",
                "help":"For HETE studies, to reduce confounding in the absence of baseline randomization one may want to identify pre-exposure patient characteristics that are associated/correlated with the study outcome.",
-               "example":"Age, sex, pre-existing dementia, BMI, Hb A1c measurement, …..",
+               "example":"Age, sex, preexisting dementia, BMI, Hb A1c measurement, …..",
                "required":true
             },
             {
diff --git a/website/project/metadata/ridie-initiation.json b/website/project/metadata/ridie-initiation.json
index 8cb4f5a4c6c..31da5da3b26 100644
--- a/website/project/metadata/ridie-initiation.json
+++ b/website/project/metadata/ridie-initiation.json
@@ -42,7 +42,7 @@
             "nav": "Status",
             "type": "choose",
             "format": "singleselect",
-            "options": [ "In Developement", "Ongoing", "Completed", "Stopped" ],
+            "options": [ "In Development", "Ongoing", "Completed", "Stopped" ],
             "title": "Status",
             "description": "What is the status of your study?",
             "help": "",
@@ -486,7 +486,7 @@
             "type": "string",
             "format": "textarea",
             "title": "Hypotheses",
-            "description": "What specific hypotheses do you plan to test with the outcome variables specified above (or other outcomes)? (You may distinguish primary and secondary hypotheses if you like.) <a target=\"_blank\" href=\"http://ridie.org/index.php?r=site/page&view=registrationHelp#Hypotheses_Section\">See help text for more informaiton.</a>",
+            "description": "What specific hypotheses do you plan to test with the outcome variables specified above (or other outcomes)? (You may distinguish primary and secondary hypotheses if you like.) <a target=\"_blank\" href=\"http://ridie.org/index.php?r=site/page&view=registrationHelp#Hypotheses_Section\">See help text for more information.</a>",
             "help": "",
             "required": false
         }, {
@@ -530,7 +530,7 @@
             "nav": "Analysis Plan",
             "type": "object",
             "title": "Analysis Plan",
-            "description": "If you have a pre-analysis plan to upload, please do so here. (Note that a pre-analysis plan is a detailed outline of the analysis plan written in advance of seeing the data which may specify hypotheses to be tested, variable construction, equations to be estimated, controls to be used, and other aspects of the analysis. See help text for further information. You may select to have the plan kept private until study completion or another date of your choosing.) <a target=\"_blank\" href=\"http://ridie.org/index.php?r=site/page&view=registrationHelp#AnalysisPlanFileId_Section\">See help text for more informaiton.</a>",
+            "description": "If you have a pre-analysis plan to upload, please do so here. (Note that a pre-analysis plan is a detailed outline of the analysis plan written in advance of seeing the data which may specify hypotheses to be tested, variable construction, equations to be estimated, controls to be used, and other aspects of the analysis. See help text for further information. You may select to have the plan kept private until study completion or another date of your choosing.) <a target=\"_blank\" href=\"http://ridie.org/index.php?r=site/page&view=registrationHelp#AnalysisPlanFileId_Section\">See help text for more information.</a>",
             "help": "",
             "properties": [
                 {
@@ -615,7 +615,7 @@
             "type": "choose",
             "format": "singleselect",
             "title": "Data Access",
-            "description": "Is this a restricted access data set? If Restricted, skip to Data Approval Process. <a target=\"_blank\" href=\"http://ridie.org/index.php?r=site/page&view=registrationHelp#OutcomesDataAccessId_Section\">See help text for more informaiton.</a>",
+            "description": "Is this a restricted access data set? If Restricted, skip to Data Approval Process. <a target=\"_blank\" href=\"http://ridie.org/index.php?r=site/page&view=registrationHelp#OutcomesDataAccessId_Section\">See help text for more information.</a>",
             "options": [
                 "Not restricted - access with no requirements or minimal requirements (e.g. web registration)",
                 "Restricted  -- Access requires a formal  approval process"
@@ -677,7 +677,7 @@
             "type": "string",
             "format": "textarea",
             "title": "Treatment Assignment Data Description",
-            "description": "What kind of data will you use for information on treatment assignment or program participation, i.e., which units received the intervention or participated in the program? Examples include administrative data, household survey, etc. (In some cases, there may be no specific data set. For example, data might simply be common knowledge that a program was implemented in a particular village. This type of information can be treated as a data set.) <a target=\"_blank\" href=\"http://ridie.org/index.php?r=site/page&view=registrationHelp#TreatmentAssignmentDataDescription_Section\">See help text for more informaiton.</a>",
+            "description": "What kind of data will you use for information on treatment assignment or program participation, i.e., which units received the intervention or participated in the program? Examples include administrative data, household survey, etc. (In some cases, there may be no specific data set. For example, data might simply be common knowledge that a program was implemented in a particular village. This type of information can be treated as a data set.) <a target=\"_blank\" href=\"http://ridie.org/index.php?r=site/page&view=registrationHelp#TreatmentAssignmentDataDescription_Section\">See help text for more information.</a>",
             "help": "",
             "required": true
         }, {
@@ -713,7 +713,7 @@
             "type": "string",
             "format": "textarea",
             "title": "Data Access",
-            "description": "Is this a restricted access data set? <a target=\"_blank\" href=\"http://ridie.org/index.php?r=site/page&view=registrationHelp#TreatmentAssignmentDataAccessId_Section\">See help text for more informaiton.</a>",
+            "description": "Is this a restricted access data set? <a target=\"_blank\" href=\"http://ridie.org/index.php?r=site/page&view=registrationHelp#TreatmentAssignmentDataAccessId_Section\">See help text for more information.</a>",
             "options": [
                 "Not restricted - access with no requirements or minimal requirements (e.g. web registration)",
                 "Restricted  -- Access requires a formal  approval process"
diff --git a/website/project/metadata/sample-schema.json b/website/project/metadata/sample-schema.json
index 881c25af75d..09c818bf8ef 100644
--- a/website/project/metadata/sample-schema.json
+++ b/website/project/metadata/sample-schema.json
@@ -93,7 +93,7 @@
       },
       {
          "block_type":"paragraph",
-         "help_text":"This is another paragraph that will appear when both drafting or reviewing responses. Pargraphs can be placed anywhere!"
+         "help_text":"This is another paragraph that will appear when both drafting or reviewing responses. Paragraphs can be placed anywhere!"
       },
       {
          "block_type":"short-text-input"
diff --git a/website/project/metadata/secondary-data.json b/website/project/metadata/secondary-data.json
index ba5c7804bec..982bde00fbe 100644
--- a/website/project/metadata/secondary-data.json
+++ b/website/project/metadata/secondary-data.json
@@ -24,7 +24,7 @@
             "format": "textarea",
             "title": "Hypotheses",
             "description": "For each of the research questions listed in the previous section, provide one or more specific and testable hypothesis. Please make clear whether the hypotheses are directional (e.g., A > B) or non-directional (e.g., A ≠ B). If directional, state the direction. You may also provide a rationale for each hypothesis.",
-            "help": "We expect that religiosity is associated with prosocial behavior in our sample as well. To assessthis prediction, we will use the following hypotheses:H0(1) = In men and women who graduated from Wisconsin high schools in 1957, there is no association between religiosity and prosocialityH1(1) = In men and women who graduated from Wisconsin high schools in 1957, there is an association between religiosity and prosociality.It is possible that these mechanisms are stronger for some religions than for others.  and prosocial behavior differs for the different religions in our sample. To answer this question, we will test the following hypotheses: H0(2) = The relationship between religiosity and prosociality in men and women who graduated from Wisconsin high schools in 1957 does not differ for people with different religious affiliations (i.e., Roman Catholics, Lutheran, Methodists, Presbyterians, United Church of Christ, and Protestants) H1(2) = The relationship between religiosity and prosociality in men and women who graduated from Wisconsin high schools in 1957 differs for people with different religious affiliations (i.e., Roman Catholics, Lutheran, Methodists, Presbyterians, United Church of Christ, and Protestants).",
+            "help": "We expect that religiosity is associated with prosocial behavior in our sample as well. To assess this prediction, we will use the following hypotheses:H0(1) = In men and women who graduated from Wisconsin high schools in 1957, there is no association between religiosity and prosocialityH1(1) = In men and women who graduated from Wisconsin high schools in 1957, there is an association between religiosity and prosociality.It is possible that these mechanisms are stronger for some religions than for others.  and prosocial behavior differs for the different religions in our sample. To answer this question, we will test the following hypotheses: H0(2) = The relationship between religiosity and prosociality in men and women who graduated from Wisconsin high schools in 1957 does not differ for people with different religious affiliations (i.e., Roman Catholics, Lutheran, Methodists, Presbyterians, United Church of Christ, and Protestants) H1(2) = The relationship between religiosity and prosociality in men and women who graduated from Wisconsin high schools in 1957 differs for people with different religious affiliations (i.e., Roman Catholics, Lutheran, Methodists, Presbyterians, United Church of Christ, and Protestants).",
             "required": true
         }]
     }, {
@@ -82,7 +82,7 @@
             "type": "object",
             "title": "Data collection procedures",
             "description": "If the data collection procedure is well documented, provide a link to that information. If the data collection procedure is not well documented, describe, to the best of your ability, how data were collected. Describe the representativeness of the sample and any possible biases stemming from the data collection.",
-            "help": "The WLS data was collected by the University of Wisconsin Survey Center for use by the research community. The origins of the WLS can be traced back to a state-sponsored questionnaire administered during the spring of 1957 at all Wisconsin high school to students in their final year. Therefore, the dataset constitutes a specific sample not necessarily representative of the United States as a whole. Most panel members were born in 1939, and thesample is broadly representative of white, non-Hispanic American men and women who completed at least a high school education. A flowchart for the data collection can be found here: https://www.ssc.wisc.edu/wlsresearch/about/flowchart/cor459d7.pdf",
+            "help": "The WLS data was collected by the University of Wisconsin Survey Center for use by the research community. The origins of the WLS can be traced back to a state-sponsored questionnaire administered during the spring of 1957 at all Wisconsin high school to students in their final year. Therefore, the dataset constitutes a specific sample not necessarily representative of the United States as a whole. Most panel members were born in 1939, and the sample is broadly representative of white, non-Hispanic American men and women who completed at least a high school education. A flowchart for the data collection can be found here: https://www.ssc.wisc.edu/wlsresearch/about/flowchart/cor459d7.pdf",
             "properties": [
                 {
                     "id": "question",
@@ -125,7 +125,7 @@
             "nav": "Manipulated variables",
             "type": "object",
             "title": "Manipulated variables",
-            "description": "If you are going to use any manipulated variables from the study variables, identify them here. Describe the variables and the levels or treatment arms of each variable. Note that this is not applicable for observational studies and meta-analyses. If you are collapsing groups across variables this should be explicitly stated, including the relevant formula. If your further analysis iscontingent on a manipulation check, describe your decisions rules here.",
+            "description": "If you are going to use any manipulated variables from the study variables, identify them here. Describe the variables and the levels or treatment arms of each variable. Note that this is not applicable for observational studies and meta-analyses. If you are collapsing groups across variables this should be explicitly stated, including the relevant formula. If your further analysis is contingent on a manipulation check, describe your decisions rules here.",
             "help": "We manipulated the percentage of sugar by mass added to brownies. The four levels of this categorical variable are: 15%, 20%, 25%, or 40% cane sugar by mass.",
             "properties": [
                 {
@@ -144,7 +144,7 @@
             "nav": "Measured variables",
             "type": "string",
             "title": "Measured variables",
-            "description": "Describe both outcome measures as well as predictors and covariates and label them accordingly. If you are using a scale or an index, state the construct the scale/index represents, which items the scale/index will consist of, and how these items will be aggregated. When the aggregation is based on exploratory factor analysis (EFA) or confirmatory factor analysis (CFA),also specify the relevant details (EFA: rotation, how the number of factors will be determined, how best fit will be selected, CFA: how loadings will be specified, how fit will be assessed, which residuals variance terms will be correlated). If you are using any categorical variables, state howyou will code them in the statistical analyses.",
+            "description": "Describe both outcome measures as well as predictors and covariates and label them accordingly. If you are using a scale or an index, state the construct that the scale/index represents, which items the scale/index will consist of, and how these items will be aggregated. When the aggregation is based on exploratory factor analysis (EFA) or confirmatory factor analysis (CFA),also specify the relevant details (EFA: rotation, how the number of factors will be determined, how best fit will be selected, CFA: how loadings will be specified, how fit will be assessed, which residuals variance terms will be correlated). If you are using any categorical variables, state how you will code them in the statistical analyses.",
             "help": "The following example is shortened. Please see https://psyarxiv.com/hvfmr/ for complete details.\n\n Religiosity (IV): Religiosity is measured using a newly created scale with a subset of items from the Religion and Spirituality module of the 2004 mail survey. The scale includes general questions about how religious/spiritual the individual is and how important religion/spirituality is to them. The specific variables are as follows:\n\nil001rer: How religious are you? \nil002rer: How spiritual are you?\nil003rer: How important is religion in your life?\nil004rer: How important is spirituality in your life?\nil005rer: How important was it, or would it have been if you had children, to send your children for religious or spiritual instruction?\nil006rer: How closely do you identify with being a member of a religious group?\n\nThe levels of all of these variables are indicated by a Likert scale with the following options: (1) Not at all; (2) Not very; (3) Somewhat; (4) Very; (5) Extremely, as well as ‘System Missing’ (the participant did not provide an answer) and ‘Refused’ (the participant refused to answer the question). Variable il006rer additionally includes the option ‘Don’t know’ (the participant stated that they did not know how to answer the question). We will use the average score (after omitting non-numeric and ‘Don’t know’ responses) on the variables as a measure of religiosity.\n\nProsociality (DV): We will use three measures of prosociality that measure three aspects of engagement in other oriented activities. The prosociality variables come from the Volunteering module of the 2004 phone survey.\n\ngv103re: Did the graduate do volunteer work in the last 12 months?\n\nThis dichotomous variable assesses whether or not the participant has engaged in any volunteering activities in the last 12 months. The levels of this variable are yes/no. Yes will be coded as ‘1’, no will be coded as ‘0’.",
             "required": true,
             "format": "textarea"
@@ -216,7 +216,7 @@
             "type": "string",
             "title": "Statistical models",
             "description": "For each hypothesis, describe the statistical model you will use to test the hypothesis. Include the type of model (e.g., ANOVA, multiple regression, SEM) and the specification of the model. Specify any interactions and post-hoc analyses and remember that any test not included here must be labeled as an exploratory test in the final paper.",
-            "help": "Our first hypothesis will be tested using three analyses since we use three variables to measureprosociality. For each, we will run a directional null hypothesis significance test to see whether apositive effect exists of religiosity on prosociality. For the first outcome (gv103re: Did the graduate do volunteer work in the last 12 months?) we will run a logistic regression with religiosity, the number of siblings, agreeableness, religious affiliation, and the interaction between religiosity and religious affiliation as predictors.\n\nFor the second and third outcomes (gv109re: Number of graduate’s other volunteer activities in the past 12 months; gv111re: How many hours did the graduate volunteer during a typical month in the last 12 months?) we will run two separate linear regressions with religiosity, the number of siblings, agreeableness, religious affiliation, and the interaction between religiosity and religious affiliation as predictors.\n\nIf the regression coefficient of the interaction between religiosity and religious affiliation is statistically significant from zero in any of the regressions, we will also carry out subgroup analyses for those particular regressions in line with our second hypothesis. This subgroup analysis involves running the regressions separately for each of the following groups: Roman Catholics, Lutherans, Methodists, Presbyterians, and followers of the United Church of Christ.\n\nThe code we will use for all these analyses can be found at https://osf.io/e3htr",
+            "help": "Our first hypothesis will be tested using three analyses since we use three variables to measureprosociality. For each, we will run a directional null hypothesis significance test to see whether a positive effect exists of religiosity on prosociality. For the first outcome (gv103re: Did the graduate do volunteer work in the last 12 months?) we will run a logistic regression with religiosity, the number of siblings, agreeableness, religious affiliation, and the interaction between religiosity and religious affiliation as predictors.\n\nFor the second and third outcomes (gv109re: Number of graduate’s other volunteer activities in the past 12 months; gv111re: How many hours did the graduate volunteer during a typical month in the last 12 months?) we will run two separate linear regressions with religiosity, the number of siblings, agreeableness, religious affiliation, and the interaction between religiosity and religious affiliation as predictors.\n\nIf the regression coefficient of the interaction between religiosity and religious affiliation is statistically significant from zero in any of the regressions, we will also carry out subgroup analyses for those particular regressions in line with our second hypothesis. This subgroup analysis involves running the regressions separately for each of the following groups: Roman Catholics, Lutherans, Methodists, Presbyterians, and followers of the United Church of Christ.\n\nThe code we will use for all these analyses can be found at https://osf.io/e3htr",
             "format": "textarea",
             "required": true
         }, {
@@ -224,7 +224,7 @@
             "nav": "Effect size",
             "type": "string",
             "title": "Effect size",
-            "description": "If applicable, specify a predicted effect size or a minimum effect size of interest for all the effectstested in your statistical analyses.",
+            "description": "If applicable, specify a predicted effect size or a minimum effect size of interest for all the effects tested in your statistical analyses.",
             "help": "For the logistic regression with ‘Did the graduate do volunteer work in the last 12 months?’ as the outcome variable, our minimum effect size of interest is an odds of 1.05. This means that a one-unit increase on the religiosity scale would be associated with a 1.05 factor change in odds of having done volunteering work in the last 12 months versus not having done so. For the linear regressions with ‘The number of graduate’s volunteer activities in the last 12 months”, and “How many hours did the graduate volunteer during a typical month in the last 12 months?’ as the outcome variables, the minimum regression coefficients of interest of the religiosity variables are 0.05 and 0.5, respectively. This means that a one-unit increase in the religiosity scale would be associated with 0.05 extra volunteering activities in the last 12 months and with 0.5 more hours of volunteering work in the last 12 months. All of these smallest effect sizes of interest are based on our own intuition.",
             "format": "textarea",
             "required": false
@@ -241,14 +241,14 @@
             "nav": "Inference criteria",
             "title": "Inference criteria",
             "description": "What criteria will you use to make inferences? Describe the information you will use (e.g. specify the p-values, effect sizes, confidence intervals, Bayes factors, specific model fit indices),as well as cut-off criteria, where appropriate. Will you be using one-or two-tailed tests for each of your analyses? If you are comparing multiple conditions or testing multiple hypotheses, will you account for this, and if so, how?",
-            "help": "We will make inferences about the association between religiosity and prosociality based on thep-values and the size of the regression coefficients of the religiosity variable in the three main regressions. We will conclude that a regression analysis supports our hypothesis if both the p-value is smaller than .01 and the regression coefficient is larger than our minimum effect size of interest. With regard to the second research question, we will conclude that religious groups differ in the association between religiosity and prosociality if we find a statistically significant coefficient using a two-tailed test of religious affiliation in at least one of the regressions. We will not use any inference criteria about the follow-up analyses per religious group because we are not going to draw any conclusions based on these analyses.",
+            "help": "We will make inferences about the association between religiosity and prosociality based on the p-values and the size of the regression coefficients of the religiosity variable in the three main regressions. We will conclude that a regression analysis supports our hypothesis if both the p-value is smaller than .01 and the regression coefficient is larger than our minimum effect size of interest. With regard to the second research question, we will conclude that religious groups differ in the association between religiosity and prosociality if we find a statistically significant coefficient using a two-tailed test of religious affiliation in at least one of the regressions. We will not use any inference criteria about the follow-up analyses per religious group because we are not going to draw any conclusions based on these analyses.",
             "type": "string",
             "format": "textarea"
         }, {
             "qid": "q25",
             "nav": "Assumption Violation/ Model Non-Convergence",
             "title": "Assumption Violation/ Model Non-Convergence",
-            "description": "What will you do should your data violate assumptions, your model not converge, or some otheranalytic problem arises?",
+            "description": "What will you do should your data violate assumptions, your model not converge, or some other analytic problem arises?",
             "help": "When the distribution of the number of volunteering hours (gv111re) is significantly non-normal according to the Kolmogorov-Smirnov test and/or (b) the linearity assumption is violated (i.e., the points are asymmetrically distributed around the diagonal line when plotting observed versus the predicted values), we will log-transform the variable.",
             "type": "string",
             "format": "textarea"
diff --git a/website/project/views/contributor.py b/website/project/views/contributor.py
index f3e06aff3fc..5001c388d26 100644
--- a/website/project/views/contributor.py
+++ b/website/project/views/contributor.py
@@ -292,7 +292,7 @@ def project_manage_contributors(auth, node, **kwargs):
         raise HTTPError(http_status.HTTP_400_BAD_REQUEST, data={'message_long': error.args[0]})
     except IntegrityError as error:
         status.push_status_message(
-            'You can not make an institutional curator a bibliographic contributor.',
+            'You cannot make an institutional curator a bibliographic contributor.',
             kind='error',
             trust=False
         )
@@ -384,7 +384,7 @@ def project_remove_contributor(auth, **kwargs):
 # TODO: consider moving this into utils
 def send_claim_registered_email(claimer, unclaimed_user, node, throttle=24 * 3600):
     """
-    A registered user claiming the unclaimed user account as an contributor to a project.
+    A registered user claiming the unclaimed user account as a contributor to a project.
     Send an email for claiming the account to the referrer and notify the claimer.
 
     :param claimer: the claimer
@@ -450,7 +450,7 @@ def send_claim_registered_email(claimer, unclaimed_user, node, throttle=24 * 360
 # TODO: consider moving this into utils
 def send_claim_email(email, unclaimed_user, node, notify=True, throttle=24 * 3600, email_template='default'):
     """
-    Unregistered user claiming a user account as an contributor to a project. Send an email for claiming the account.
+    Unregistered user claiming a user account as a contributor to a project. Send an email for claiming the account.
     Either sends to the given email or the referrer's email, depending on the email address provided.
 
     :param str email: The address given in the claim user form
diff --git a/website/project/views/node.py b/website/project/views/node.py
index 32048444c7a..c07a1377086 100644
--- a/website/project/views/node.py
+++ b/website/project/views/node.py
@@ -884,7 +884,7 @@ def _view_project(node, auth, primary=False,
     }
 
     # Default should be at top of list for UI and for the project overview page the default region
-    # for a component is that of the it's parent node.
+    # for a component is that of its parent node.
     region_list = get_storage_region_list(user, node=node)
 
     data.update({'storage_regions': region_list})
@@ -1188,7 +1188,7 @@ def get_node_tree(auth, **kwargs):
 @must_be_valid_project
 @must_have_permission(ADMIN)
 def project_generate_private_link_post(auth, node, **kwargs):
-    """ creata a new private link object and add it to the node and its selected children"""
+    """ create a new private link object and add it to the node and its selected children"""
 
     node_ids = request.json.get('node_ids', [])
     name = request.json.get('name', '')
diff --git a/website/routes.py b/website/routes.py
index 195476ec50f..80b0d8bec92 100644
--- a/website/routes.py
+++ b/website/routes.py
@@ -810,7 +810,7 @@ def make_url_map(app):
             notemplate
         ),
 
-        # forgot password post - instutitional
+        # forgot password post - institutional
         Rule(
             '/forgotpassword-institution/',
             'post',
@@ -867,7 +867,7 @@ def make_url_map(app):
         # user will be required to verify password
         # claim token must be present in query parameter
         Rule(
-            ['/user/<uid>/<pid>/claim/verify/<token>/'],
+            ['/legacy/user/<uid>/<pid>/claim/verify/<token>/'],
             ['get', 'post'],
             project_views.contributor.claim_user_registered,
             OsfWebRenderer('claim_account_registered.mako', trust=False)
diff --git a/website/search/elastic_search.py b/website/search/elastic_search.py
index 00f9e96ceb8..107feda2010 100644
--- a/website/search/elastic_search.py
+++ b/website/search/elastic_search.py
@@ -323,7 +323,7 @@ def load_parent(parent_id):
             'title': parent.title,
             'url': parent.url,
             'id': parent._id,
-            'is_registation': parent.is_registration,
+            'is_registration': parent.is_registration,
         }
     return None
 
@@ -436,7 +436,7 @@ def serialize_preprint(preprint, category):
         'tags': list(preprint.tags.filter(system=False).values_list('name', flat=True)),
         'description': preprint.description,
         'url': preprint.url,
-        'date_created': preprint.created,
+        'date_created': preprint.date_created_first_version,
         'license': serialize_node_license_record(preprint.license),
         'boost': 2,  # More relevant than a registration
         'extra_search_terms': clean_splitters(preprint.title),
diff --git a/website/search/views.py b/website/search/views.py
index 416536a79e6..e774d52532e 100644
--- a/website/search/views.py
+++ b/website/search/views.py
@@ -127,7 +127,7 @@ def search_projects_by_title(**kwargs):
     ignore_nodes = request.args.getlist('ignoreNode', [])
 
     matching_title = Q(
-        title__icontains=term,  # search term (case insensitive)
+        title__icontains=term,  # search term (case-insensitive)
         category=category  # is a project
     )
 
diff --git a/website/search_migration/solr_migrations.md b/website/search_migration/solr_migrations.md
index 6f8c0e74a2f..98d5dce8ae9 100644
--- a/website/search_migration/solr_migrations.md
+++ b/website/search_migration/solr_migrations.md
@@ -3,7 +3,7 @@ Solr organizes data into "documents" which can then be search on.
 Our Solr schema has 12 main fields:
 
 	id -- this is for our project and users. each project is self contained in one
-	document, and users are similary self contanied in one document
+	document, and users are similary self contained in one document
 
 	** a note: * denotes a dynamic field in Solr. It means that any combination of
 	characters can be used at the beginning of that field. the majority of our fields
@@ -15,7 +15,7 @@ Our Solr schema has 12 main fields:
 	*_public
 	*_wiki
 	*_description
-	*_url -- we wont search on url so it is not indexed, but we're keeping it so we cna
+	*_url -- we won't search on url so it is not indexed, but we're keeping it so we can
 	navigate to the project
 	*_tags -- this is a multivalued values, meaning that it can have multiple values.
 	components can have multiple tags, so this field is multivalued
@@ -23,7 +23,7 @@ Our Solr schema has 12 main fields:
 	ways of capturing the same information. searching contributors returns the projects
 	that the searched for person is part of it. alternatively, searching users returns
 	the profile pages of the user **
-	*_contributors_url -- not indexed because we wont search on it, but we will keep it
+	*_contributors_url -- not indexed because we won't search on it, but we will keep it
 	so we can easily navigate to contributor
 	public -- not dynamic, as we will filter projects that are not public. if a node is
 	private, we still want to return the project itself.
diff --git a/website/settings/defaults.py b/website/settings/defaults.py
index 80cc6b18ed1..aaa8173acf9 100644
--- a/website/settings/defaults.py
+++ b/website/settings/defaults.py
@@ -445,7 +445,6 @@ class CeleryConfig:
         'osf.management.commands.sync_doi_metadata',
         'osf.management.commands.sync_collection_provider_indices',
         'osf.management.commands.sync_datacite_doi_metadata',
-        'osf.management.commands.update_institution_project_counts',
         'osf.management.commands.populate_branched_from',
         'osf.management.commands.spam_metrics',
         'osf.management.commands.daily_reporters_go',
@@ -575,7 +574,6 @@ class CeleryConfig:
         'osf.management.commands.deactivate_requested_accounts',
         'osf.management.commands.check_crossref_dois',
         'osf.management.commands.find_spammy_files',
-        'osf.management.commands.update_institution_project_counts',
         'osf.management.commands.correct_registration_moderation_states',
         'osf.management.commands.sync_collection_provider_indices',
         'osf.management.commands.sync_datacite_doi_metadata',
@@ -718,10 +716,6 @@ class CeleryConfig:
                 'task': 'management.commands.check_crossref_dois',
                 'schedule': crontab(minute=0, hour=4),  # Daily 11:00 p.m.
             },
-            'update_institution_project_counts': {
-                'task': 'management.commands.update_institution_project_counts',
-                'schedule': crontab(minute=0, hour=9), # Daily 05:00 a.m. EDT
-            },
 #            'archive_registrations_on_IA': {
 #                'task': 'osf.management.commands.archive_registrations_on_IA',
 #                'schedule': crontab(minute=0, hour=5),  # Daily 4:00 a.m.
diff --git a/website/static/css/pages/project-page.css b/website/static/css/pages/project-page.css
index 9c3f785a98c..0ed76671139 100644
--- a/website/static/css/pages/project-page.css
+++ b/website/static/css/pages/project-page.css
@@ -250,7 +250,7 @@ li.addon-categories a{
     vertical-align: baseline;
     width:30%;
 }
-/*Moves maintenence alert under project header*/
+/*Moves maintenance alert under project header*/
 #maintenance.alert {
     position: relative;
     top: 45px;
diff --git a/website/static/css/pages/wiki-page.css b/website/static/css/pages/wiki-page.css
index 20ebf923f7c..40764d3fb11 100644
--- a/website/static/css/pages/wiki-page.css
+++ b/website/static/css/pages/wiki-page.css
@@ -28,7 +28,7 @@
 .wiki-sidenav h4 {
     margin-top:20px;
     margin-bottom: 0;
-    font-weigth: normal;
+    font-weight: normal;
 }
 .osf-sidenav.wiki-sidenav ul>li a:hover {
     background: transparent;
diff --git a/website/static/css/style.css b/website/static/css/style.css
index 73403900b5c..5cf10073ca0 100644
--- a/website/static/css/style.css
+++ b/website/static/css/style.css
@@ -4,7 +4,6 @@ html, body {
 }
 
 body {
-    padding-top: 50px; /* body padding for fixed top nav */
     position: relative; /* for bootstrap affix */
     -webkit-font-smoothing: antialiased;
     font-family: 'Open Sans', 'Helvetica Neue', sans-serif;
@@ -38,6 +37,19 @@ a {
 
 /* Footer
 -------------------------------------------------- */
+.footer-wrapper {
+    margin-top: 20px;
+    text-shadow: 0 1px 0 #fff;
+    width: 100%;
+    color: #515151;
+    text-align: center;
+    background-color: #e6f1fc;
+    border-radius: 0 0 0 0.75rem;
+
+    .footer-row:first-of-type {
+        background-color: #f1f8fd;
+    }
+}
 .footer {
     padding-top: 10px;
     margin-top: 20px;
@@ -52,13 +64,25 @@ a {
     color: #2d6a9f;
 }
 
-
 .footer ul, .footer li {
     padding: 0;
     margin: 0;
     list-style-type: none;
 }
 
+.footer-row {
+    display: flex;
+    justify-content: space-between;
+    flex-wrap: wrap;
+    align-items: center;
+    padding: 1.5em;
+}
+
+.footer-logo span {
+    font-size: 20px;
+    width: 44px;
+}
+
 /* Warning Banner for cookies and browser depreciation goes on bottom of page */
 .warningBanner {
     margin-bottom: 0px;
@@ -82,6 +106,15 @@ a {
     color: #264F82;
 }
 
+.footer-social-links-list {
+    display: inline-flex;
+}
+
+.footer-links-list {
+    display: inline-flex;
+    gap: 0.5em;
+}
+
 .warningBannerText {
     margin-left: 10%;
     margin-right: 75px;
@@ -147,7 +180,7 @@ a {
     height: auto;
 }
 
-/* Project page has project navigation bar, which is fixed and therefore increases the offset the anchors need */
+/* Project page has project navigation bar, which is fixed and therefore increases the offset that anchors need */
 .project-page .anchor {
     margin-top: -100px;
     padding-top: 100px;
@@ -240,7 +273,7 @@ a {
     }
 }
 
-/* Allow search-bar and nav-bar to support mutiple size of screen */
+/* Allow search-bar and nav-bar to support multiple size of screen */
 @media (max-width: 767px) {
     #searchControls > .osf-search {
         z-index: 99;
@@ -647,7 +680,7 @@ button.close {
     font-family : 'Open Sans', Helvetica, sans-serif;
 }
 
-/* Bootstrap Accesibility Override */
+/* Bootstrap Accessibility Override */
 .btn-success-high-contrast {
     background-color: #006803;
     border-color: #54AC54;
@@ -954,3 +987,206 @@ table.add-links {
 .text-smaller {
     color: #4d4d4d;
 }
+
+/* Override of Bootstrap button styles */
+.container.container {
+    width: auto !important;
+}
+
+.btn.btn {
+    border-radius: 6px;
+    padding-block: 0.5rem;
+    padding-inline: 1rem;
+    font-weight: 700;
+}
+
+.btn-primary.btn-primary {
+    color: #fff;
+    background-color: #337ab7;
+    border-color: #2e6da4;
+}
+
+.btn-secondary.btn-secondary {
+    color: #337ab7;
+    background: #f1f8fd;
+}
+
+input.form-control.form-control {
+    border-radius: 6px;
+}
+
+/* Utility classes */
+
+.border-top {
+    border-top: 1px solid #eee;
+}
+
+.flex-row {
+    display: flex;
+}
+
+.gap-1 {
+    gap: 1em;
+}
+
+.flex-grow-1 {
+    flex-grow: 1;
+}
+
+.padding-top-2 {
+    padding-top: 2em;
+}
+
+.navbar {
+    background: #24384a;
+}
+
+.main-wrapper {
+    display: flex;
+    min-height: 100vh;
+    flex-direction: row;
+    background: #24384a;
+}
+
+.content-wrapper {
+    flex-grow: 1;
+    display: flex;
+    flex-direction: column;
+    height: 100vh;
+    overflow-y: auto;
+    background: linear-gradient(135deg, #e6f1fc 0%, #f7f7f7 60%, #eaf6ff 100%);
+    background-color: #f7f7f7;
+}
+
+.main-content {
+    margin: 50px auto 0;
+    display: flex;
+    align-items: center;
+
+    [role="main"] {
+        border-radius: 0.75rem;
+        background: #fff;
+        padding: 2em;
+    }
+}
+
+.left-logo {
+    display: inline-flex;
+    align-items: center;
+    margin-left: 0 !important;
+    height: 100%;
+    line-height: 27px !important;
+    gap: 8px;
+    font-size: 32px;
+    font-weight: lighter;
+    color: #f7f7f7;
+
+    .osf-navbar-logo {
+        width: 33px;
+        height: 33px;
+        margin: 6px 0 0 12px;
+    }
+}
+
+.toggle-nav-input {
+    float: right;
+}
+
+.toggle-nav-label {
+    color: #f7f7f7;
+    float: right;
+    margin: 12px;
+}
+
+.slideout {
+    position: fixed;
+    top: 0;
+    left: 0;
+    height: 100%;
+    background: #24384a;
+    color: #f7f7f7;
+    transition: transform 0.3s ease;
+    margin-left: 0 !important;
+}
+
+.left-pane-nav {
+    width: 300px;
+    max-width: 300px;
+    height: 100vh;
+    overflow-y: auto;
+    scrollbar-width: thin;
+    scrollbar-color: #eff0f1 #24384a;
+}
+
+.left-pane-ul {
+    list-style: none;
+    padding: 0;
+    margin: 0;
+    margin-top: 2em;
+    margin-bottom: 4em;
+
+    li {
+        margin: 0 1.5em 1em;
+    }
+
+    a {
+        display: flex;
+        align-items: center;
+        padding: 0.75em;
+        gap: 0.5em;
+        width: 100%;
+        font-size: medium;
+        font-weight: 700;
+        color: #F7F7F7;
+        text-decoration: none;
+    }
+
+    a:hover {
+        background: #384b5c;
+        border-radius: 0.375em;
+    }
+}
+
+.chevron-right {
+    margin-left: auto;
+}
+
+@media (min-width: 1200px){
+    .content-wrapper {
+        border-radius: 0.75rem 0 0 0.75rem;
+    }
+    .slideout {
+        transform: translateX(0);
+    }
+    .desktop-only {
+        display: block;
+    }
+    .mobile-only {
+        display: none;
+    }
+}
+
+@media (max-width: 1199.99px){
+    .slideout {
+        transform: translateX(-100%);
+    }
+
+    input#toggle-leftnav:checked~.slideout {
+        transform: translateX(0);
+    }
+    .desktop-only {
+        display: none;
+    }
+    .mobile-only {
+        display: block;
+    }
+
+    #maintenance {
+        margin-top: 50px;
+    }
+}
+
+#slideout-nav {
+    margin-left: 0 !important;
+    margin-top: 50px;
+}
diff --git a/website/static/img/left-nav-icons/meetings.svg b/website/static/img/left-nav-icons/meetings.svg
new file mode 100644
index 00000000000..0dc4b6f11b0
--- /dev/null
+++ b/website/static/img/left-nav-icons/meetings.svg
@@ -0,0 +1,3 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M4.5 2C5.16304 2 5.79893 2.26339 6.26777 2.73223C6.73661 3.20107 7 3.83696 7 4.5C7 5.16304 6.73661 5.79893 6.26777 6.26777C5.79893 6.73661 5.16304 7 4.5 7C3.83696 7 3.20107 6.73661 2.73223 6.26777C2.26339 5.79893 2 5.16304 2 4.5C2 3.83696 2.26339 3.20107 2.73223 2.73223C3.20107 2.26339 3.83696 2 4.5 2ZM16 2C16.663 2 17.2989 2.26339 17.7678 2.73223C18.2366 3.20107 18.5 3.83696 18.5 4.5C18.5 5.16304 18.2366 5.79893 17.7678 6.26777C17.2989 6.73661 16.663 7 16 7C15.337 7 14.7011 6.73661 14.2322 6.26777C13.7634 5.79893 13.5 5.16304 13.5 4.5C13.5 3.83696 13.7634 3.20107 14.2322 2.73223C14.7011 2.26339 15.337 2 16 2ZM0 11.3344C0 9.49375 1.49375 8 3.33437 8H4.66875C5.16562 8 5.6375 8.10938 6.0625 8.30312C6.02187 8.52812 6.00313 8.7625 6.00313 9C6.00313 10.1938 6.52812 11.2656 7.35625 12C7.35 12 7.34375 12 7.33437 12H0.665625C0.3 12 0 11.7 0 11.3344ZM12.6656 12C12.6594 12 12.6531 12 12.6438 12C13.475 11.2656 13.9969 10.1938 13.9969 9C13.9969 8.7625 13.975 8.53125 13.9375 8.30312C14.3625 8.10625 14.8344 8 15.3313 8H16.6656C18.5063 8 20 9.49375 20 11.3344C20 11.7031 19.7 12 19.3344 12H12.6687H12.6656ZM7 9C7 8.20435 7.31607 7.44129 7.87868 6.87868C8.44129 6.31607 9.20435 6 10 6C10.7956 6 11.5587 6.31607 12.1213 6.87868C12.6839 7.44129 13 8.20435 13 9C13 9.79565 12.6839 10.5587 12.1213 11.1213C11.5587 11.6839 10.7956 12 10 12C9.20435 12 8.44129 11.6839 7.87868 11.1213C7.31607 10.5587 7 9.79565 7 9ZM4 17.1656C4 14.8656 5.86562 13 8.16562 13H11.8313C14.1344 13 16 14.8656 16 17.1656C16 17.625 15.6281 18 15.1656 18H4.83125C4.37188 18 3.99688 17.6281 3.99688 17.1656H4Z" fill="white"/>
+</svg>
diff --git a/website/static/img/left-nav-icons/preprints.svg b/website/static/img/left-nav-icons/preprints.svg
new file mode 100644
index 00000000000..7573b0285c8
--- /dev/null
+++ b/website/static/img/left-nav-icons/preprints.svg
@@ -0,0 +1,11 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_8_44899)">
+<path d="M3.33398 5.625C3.33398 3.4425 5.10982 1.66667 7.29232 1.66667H14.9032C14.629 0.7075 13.7548 0 12.709 0H3.12565C1.86148 0 0.833984 1.0275 0.833984 2.29167V15.2083C0.833984 16.4725 1.86148 17.5 3.12565 17.5H3.33398V5.625Z" fill="white"/>
+<path d="M16.875 3.33301H7.29167C6.0275 3.33301 5 4.36051 5 5.62467V17.708C5 18.9722 6.0275 19.9997 7.29167 19.9997H16.875C18.1392 19.9997 19.1667 18.9722 19.1667 17.708V5.62467C19.1667 4.36051 18.1392 3.33301 16.875 3.33301ZM15.2083 17.4997H8.95833C8.61333 17.4997 8.33333 17.2197 8.33333 16.8747C8.33333 16.5297 8.61333 16.2497 8.95833 16.2497H15.2083C15.5533 16.2497 15.8333 16.5297 15.8333 16.8747C15.8333 17.2197 15.5533 17.4997 15.2083 17.4997ZM15.2083 14.1663H8.95833C8.61333 14.1663 8.33333 13.8863 8.33333 13.5413C8.33333 13.1963 8.61333 12.9163 8.95833 12.9163H15.2083C15.5533 12.9163 15.8333 13.1963 15.8333 13.5413C15.8333 13.8863 15.5533 14.1663 15.2083 14.1663ZM15.2083 11.2497H8.95833C8.61333 11.2497 8.33333 10.9697 8.33333 10.6247C8.33333 10.2797 8.61333 9.99967 8.95833 9.99967H15.2083C15.5533 9.99967 15.8333 10.2797 15.8333 10.6247C15.8333 10.9697 15.5533 11.2497 15.2083 11.2497ZM15.2083 7.91634H8.95833C8.61333 7.91634 8.33333 7.63634 8.33333 7.29134C8.33333 6.94634 8.61333 6.66634 8.95833 6.66634H15.2083C15.5533 6.66634 15.8333 6.94634 15.8333 7.29134C15.8333 7.63634 15.5533 7.91634 15.2083 7.91634Z" fill="white"/>
+</g>
+<defs>
+<clipPath id="clip0_8_44899">
+<rect width="20" height="20" fill="white"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/website/static/img/left-nav-icons/registries.svg b/website/static/img/left-nav-icons/registries.svg
new file mode 100644
index 00000000000..02bf3043451
--- /dev/null
+++ b/website/static/img/left-nav-icons/registries.svg
@@ -0,0 +1,3 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M2.22222 3.71429C1.91667 3.71429 1.66667 3.97143 1.66667 4.28571V15.7143C1.66667 16.0286 1.91667 16.2857 2.22222 16.2857H17.7778C18.0833 16.2857 18.3333 16.0286 18.3333 15.7143V4.28571C18.3333 3.97143 18.0833 3.71429 17.7778 3.71429H2.22222ZM0 4.28571C0 3.025 0.996528 2 2.22222 2H17.7778C19.0035 2 20 3.025 20 4.28571V15.7143C20 16.975 19.0035 18 17.7778 18H2.22222C0.996528 18 0 16.975 0 15.7143V4.28571ZM3.33333 6.57143C3.33333 6.26832 3.4504 5.97763 3.65877 5.76331C3.86714 5.54898 4.14976 5.42857 4.44444 5.42857C4.73913 5.42857 5.02174 5.54898 5.23012 5.76331C5.43849 5.97763 5.55556 6.26832 5.55556 6.57143C5.55556 6.87453 5.43849 7.16522 5.23012 7.37955C5.02174 7.59388 4.73913 7.71429 4.44444 7.71429C4.14976 7.71429 3.86714 7.59388 3.65877 7.37955C3.4504 7.16522 3.33333 6.87453 3.33333 6.57143ZM6.94444 6.57143C6.94444 6.09643 7.31597 5.71429 7.77778 5.71429H15.5556C16.0174 5.71429 16.3889 6.09643 16.3889 6.57143C16.3889 7.04643 16.0174 7.42857 15.5556 7.42857H7.77778C7.31597 7.42857 6.94444 7.04643 6.94444 6.57143ZM6.94444 10C6.94444 9.525 7.31597 9.14286 7.77778 9.14286H15.5556C16.0174 9.14286 16.3889 9.525 16.3889 10C16.3889 10.475 16.0174 10.8571 15.5556 10.8571H7.77778C7.31597 10.8571 6.94444 10.475 6.94444 10ZM6.94444 13.4286C6.94444 12.9536 7.31597 12.5714 7.77778 12.5714H15.5556C16.0174 12.5714 16.3889 12.9536 16.3889 13.4286C16.3889 13.9036 16.0174 14.2857 15.5556 14.2857H7.77778C7.31597 14.2857 6.94444 13.9036 6.94444 13.4286ZM4.44444 11.1429C4.14976 11.1429 3.86714 11.0224 3.65877 10.8081C3.4504 10.5938 3.33333 10.3031 3.33333 10C3.33333 9.6969 3.4504 9.40621 3.65877 9.19188C3.86714 8.97755 4.14976 8.85714 4.44444 8.85714C4.73913 8.85714 5.02174 8.97755 5.23012 9.19188C5.43849 9.40621 5.55556 9.6969 5.55556 10C5.55556 10.3031 5.43849 10.5938 5.23012 10.8081C5.02174 11.0224 4.73913 11.1429 4.44444 11.1429ZM3.33333 13.4286C3.33333 13.1255 3.4504 12.8348 3.65877 12.6205C3.86714 12.4061 4.14976 12.2857 4.44444 12.2857C4.73913 12.2857 5.02174 12.4061 5.23012 12.6205C5.43849 12.8348 5.55556 13.1255 5.55556 13.4286C5.55556 13.7317 5.43849 14.0224 5.23012 14.2367C5.02174 14.451 4.73913 14.5714 4.44444 14.5714C4.14976 14.5714 3.86714 14.451 3.65877 14.2367C3.4504 14.0224 3.33333 13.7317 3.33333 13.4286Z" fill="white"/>
+</svg>
diff --git a/website/static/js/addonPermissions.js b/website/static/js/addonPermissions.js
index 9f6a072e523..2821d370113 100644
--- a/website/static/js/addonPermissions.js
+++ b/website/static/js/addonPermissions.js
@@ -18,7 +18,7 @@ var AddonPermissionsTable = {
             var apiUrl = $(this).attr('api-url')+ addonShortName + '/config/';
             bootbox.confirm({
                 title: 'Remove addon?',
-                message: 'Are you sure you want to disconnnect the ' + $osf.htmlEscape(addonFullname) + ' account from this project?',
+                message: 'Are you sure you want to disconnect the ' + $osf.htmlEscape(addonFullname) + ' account from this project?',
                 callback: function (confirm) {
                     if (confirm) {
                         $.ajax({
diff --git a/website/static/js/anonymousLogActionsList.json b/website/static/js/anonymousLogActionsList.json
index e047fbdfc29..75dc61d5682 100644
--- a/website/static/js/anonymousLogActionsList.json
+++ b/website/static/js/anonymousLogActionsList.json
@@ -86,7 +86,7 @@
     "osf_storage_file_removed" : "A user removed a file from OSF Storage in a project",
     "affiliated_institution_added": "A user added an affiliation to a project",
     "affiliated_institution_removed": "A user removed an affiliation from a project",
-    "preprint_initiated": "A user made a project a preprint",
+    "preprint_initiated": "A user made a project into a preprint",
     "preprint_file_updated": "A user updated the primary file of a preprint",
     "preprint_license_updated": "A user updated the license of a preprint",
     "subjects_updated": "A user updated the subjects",
diff --git a/website/static/js/citationGrid.js b/website/static/js/citationGrid.js
index 60bdc13de7a..e4e0903d461 100644
--- a/website/static/js/citationGrid.js
+++ b/website/static/js/citationGrid.js
@@ -211,7 +211,7 @@ var renderActions = function(item, col) {
             config: function(elm, isInit, ctx) {
                 // In JS, double-backlashes escape in-string backslashes,
                 // Quick overview of RTF file formatting (see https://msdn.microsoft.com/en-us/library/aa140284%28v=office.10%29.aspx for more):
-                // "{\rtf1\ansi             <- RTF headers indicating RTF version and char encoding, other headers possible but unecessary
+                // "{\rtf1\ansi             <- RTF headers indicating RTF version and char encoding, other headers possible but unnecessary
                 //  [content line 1]\       <- Trailing backlash indicating newline in displayed file, \n otherwise ignored for display
                 //  [content line 2]        <- Trailing backslash not strictly necessary for final line, but doesn't hurt
                 //  }"                      <- Closing brace indicates EOF for display purposes
diff --git a/website/static/js/citationWidget.js b/website/static/js/citationWidget.js
index a939fd44267..8ed0e1a2a77 100644
--- a/website/static/js/citationWidget.js
+++ b/website/static/js/citationWidget.js
@@ -63,7 +63,7 @@ CitationWidget.prototype.init = function() {
         $.when(styleRequest, citationRequest).done(function(style, data) {
             var citeproc = citations.makeCiteproc(style[0], data[0], 'html');
             var items = citeproc.makeBibliography()[1];
-            /* the safety of this was discussed with JIRA ticket OSF-4889 */
+            /* the safety of this was discussed with Jira ticket OSF-4889 */
             self.$citationElement.html(items[0]).slideDown();
         }).fail(function(jqxhr, status, error) {
             $osf.growl(
diff --git a/website/static/js/components/legend.js b/website/static/js/components/legend.js
index aa0ad14264e..7a52e63eeb5 100644
--- a/website/static/js/components/legend.js
+++ b/website/static/js/components/legend.js
@@ -12,7 +12,7 @@ module.exports = {
                     b == Uncat     = -1
                     a == Other
                         b == Uncat = -1
-                        otherswise =  1
+                        otherwise  =  1
                     b == Other
                         a == Uncat =  1
                         otherwise  = -1
diff --git a/website/static/js/components/publicNodes.js b/website/static/js/components/publicNodes.js
index 12141e19b5b..8593438a570 100644
--- a/website/static/js/components/publicNodes.js
+++ b/website/static/js/components/publicNodes.js
@@ -190,7 +190,7 @@ var PublicNodes = {
                 ' if the problem persists.'
             ]) :
 
-            // Show laoding icon while there is a pending request
+            // Show loading icon while there is a pending request
             ctrl.requestPending() ?  m('.ball-pulse.ball-scale-blue.text-center', [m(''), m(''), m('')]) :
 
             // Display each project
diff --git a/website/static/js/contribRemover.js b/website/static/js/contribRemover.js
index 2b064b1ec9d..f00e543029a 100644
--- a/website/static/js/contribRemover.js
+++ b/website/static/js/contribRemover.js
@@ -127,7 +127,7 @@ var RemoveContributorViewModel = oop.extend(Paginator, {
         });
 
         self.hasChildrenToRemove = ko.computed(function() {
-            //if there is more then one node to remove, then show a simplified page
+            //if there is more than one node to remove, then show a simplified page
             if (self.canRemoveNodesLength() > 1 && self.titlesToRemove().length > 1) {
                 self.page(self.REMOVE);
                 return true;
diff --git a/website/static/js/fangorn.js b/website/static/js/fangorn.js
index ba4e159d716..17471da41b5 100644
--- a/website/static/js/fangorn.js
+++ b/website/static/js/fangorn.js
@@ -50,7 +50,7 @@ var STATE_MAP = {
 var SYNC_UPLOAD_ADDONS = ['github', 'dataverse'];
 var READ_ONLY_ADDONS = ['bitbucket', 'gitlab'];
 var MOVE_INTERVAL;
-var MILLSECOND_PER_MOVE_REQUEST = 500;
+var MILLISECOND_PER_MOVE_REQUEST = 500;
 
 var CONFLICT_INFO = {
     skip: {
@@ -1057,7 +1057,7 @@ function _fangornDropzoneError(treebeard, file, message, xhr) {
 }
 
 /**
- * Click event for when upload buttonin Action Column, it essentially runs the hiddenFileInput.click
+ * Click event for when upload button in Action Column, it essentially runs the hiddenFileInput.click
  * @param event DOM event object for click
  * @param {Object} item A Treebeard _item object for the row involved. Node information is inside item.data
  * @param {Object} col Information pertinent to that column where this upload event is run from
@@ -1491,7 +1491,7 @@ function _fangornLazyLoadError (item) {
 }
 
 /**
- * Applies the positionining and initialization of tooltips for file names
+ * Applies the positioning and initialization of tooltips for file names
  * @private
  */
 function reapplyTooltips () {
@@ -1577,7 +1577,7 @@ function gotoFileEvent (item, toUrl) {
 /**
  * Defines the contents of the title column (does not include the toggle and folder sections
  * @param {Object} item A Treebeard _item object for the row involved. Node information is inside item.data
- * @param {Object} col Options for this particulat column
+ * @param {Object} col Options for this particular column
  * @this Treebeard.controller
  * @returns {Array} Returns an array of mithril template objects using m()
  * @private
@@ -2549,7 +2549,7 @@ var copyMode = null;
 
 /**
  * Hook for the drag start event on jquery
- * @param event jQuery UI drggable event object
+ * @param event jQuery UI draggable event object
  * @param ui jQuery UI draggable ui object
  * @private
  */
@@ -2715,7 +2715,7 @@ function _dropLogic(event, items, folder) {
                 } else {
                     MOVE_INTERVAL = clearInterval(MOVE_INTERVAL);
                 }
-            }, MILLSECOND_PER_MOVE_REQUEST);
+            }, MILLISECOND_PER_MOVE_REQUEST);
         }
     }
 
@@ -3054,10 +3054,10 @@ tbOptions = {
             }
         });
     },
-    movecheck : function (to, from) { //This method gives the users an option to do checks and define their return
+    movecheck : function (to, from) { //This method gives users an option to do checks and define their return
         return true;
     },
-    movefail : function (to, from) { //This method gives the users an option to do checks and define their return
+    movefail : function (to, from) { //This method gives users an option to do checks and define their return
         return true;
     },
     addcheck : function (treebeard, item, file) {
diff --git a/website/static/js/filepage/revisions.js b/website/static/js/filepage/revisions.js
index c938bb68bc0..52436f34058 100644
--- a/website/static/js/filepage/revisions.js
+++ b/website/static/js/filepage/revisions.js
@@ -46,10 +46,10 @@ var FileRevisionsTable = {
             }).done(function(response) {
                 response = waterbutler.wbLazyLoadPreprocess.call(this, response);
                 m.startComputation();
-                var urlParmas = $osf.urlParams();
+                var urlParams = $osf.urlParams();
                 model.revisions = response.data.map(function(rev, index) {
                     rev = FileRevisionsTable.postProcessRevision(self.file, self.node, rev, index);
-                    if (urlParmas[rev.versionIdentifier] === rev.version) {
+                    if (urlParams[rev.versionIdentifier] === rev.version) {
                         model.selectedRevision = index;
                     }
                     return rev;
diff --git a/website/static/js/filesWidget.js b/website/static/js/filesWidget.js
index 0f695de8abc..9856e027088 100644
--- a/website/static/js/filesWidget.js
+++ b/website/static/js/filesWidget.js
@@ -10,7 +10,7 @@ var Fangorn = require('js/fangorn').Fangorn;
  * Modularized files widget
  *
  * @param {String} divID id of target div
- * @param {String} filesUrl url to fecth files data for during init
+ * @param {String} filesUrl url to fetch files data for during init
  * @param {Object} opts optional overrides to Treebeard options
  **/
 var FilesWidget = function(divID, filesUrl, opts) {
diff --git a/website/static/js/growlBox.js b/website/static/js/growlBox.js
index 68fb47153fb..53428764b14 100644
--- a/website/static/js/growlBox.js
+++ b/website/static/js/growlBox.js
@@ -10,7 +10,7 @@ var oop = require('js/oop');
 * @param {String} title Shows in bold at the top of the box. Required or it looks foolish.
 * @param {String} message Shows a line below the title. This could be '' if there's nothing to say.
 * @param {String} type One of 'success', 'info', 'warning', or 'danger'. Defaults to danger.
-* @param {Number} delay if provided the number of miliseconds before message disappears
+* @param {Number} delay if provided the number of milliseconds before message disappears
  */
 var GrowlBox = oop.defclass({
     constructor: function(title, message, type, delay) {
diff --git a/website/static/js/koHelpers.js b/website/static/js/koHelpers.js
index 7dd7a24b7c3..569f92fa635 100644
--- a/website/static/js/koHelpers.js
+++ b/website/static/js/koHelpers.js
@@ -361,7 +361,7 @@ ko.bindingHandlers.anchorScroll = {
                 event.preventDefault();
                 // get location of the target
                 var target = $item.attr('href');
-                // if target has a scrollbar scroll it, otherwise scroll the page
+                // if target has a scrollbar scroll it; otherwise, scroll the page
                 if ( $element.get(0).scrollHeight > $element.innerHeight() ) {
                     offset = $(target).position();
                     $element.scrollTop(offset.top - buffer);
diff --git a/website/static/js/logActionsList.json b/website/static/js/logActionsList.json
index 53c5ef02f04..8545c89b8c8 100644
--- a/website/static/js/logActionsList.json
+++ b/website/static/js/logActionsList.json
@@ -95,6 +95,7 @@
     "subjects_updated": "${user} updated the subjects on ${node}",
     "view_only_link_added": "${user} created ${anonymous_link} view-only link to ${node}",
     "view_only_link_removed": "${user} removed ${anonymous_link} view-only link to ${node}",
+    "registration_date_updated": "${user} updated registration date of ${node} from ${last_date} to ${new_date}",
     "has_coi_updated": "${user} changed the conflict of interest statement availability for ${preprint}.",
     "coi_statement_updated": "${user} changed the conflict of interest statement for ${preprint}.",
     "has_data_links_updated": "${user} has updated the has links to data field to ${value}",
diff --git a/website/static/js/logTextParser.js b/website/static/js/logTextParser.js
index f3248fc8ffd..c78358f0534 100644
--- a/website/static/js/logTextParser.js
+++ b/website/static/js/logTextParser.js
@@ -223,7 +223,7 @@ var LogPieces = {
             else if (userObject && userObject.errors[0].meta) {
                 return m('span', userObject.errors[0].meta.full_name);
             }
-            else if (githubUser){ //paramIsReturned skipped b/c this is applicable in only a few situtations
+            else if (githubUser){ //paramIsReturned skipped b/c this is applicable in only a few situations
                 return m('span', githubUser);
             }
             else {
diff --git a/website/static/js/markdown-it-pymarkdown-lists.js b/website/static/js/markdown-it-pymarkdown-lists.js
index 05722b1aede..627c1628465 100644
--- a/website/static/js/markdown-it-pymarkdown-lists.js
+++ b/website/static/js/markdown-it-pymarkdown-lists.js
@@ -300,7 +300,7 @@ module.exports = function list(state, startLine, endLine, silent) {
         }
     }
 
-    // Finilize list
+    // Finalize list
     if (state.renderList) {
         if (isOrdered) {
             token = state.push('ordered_list_close', 'ol', -1);
diff --git a/website/static/js/myProjects.js b/website/static/js/myProjects.js
index 347e39f6aa4..830df968276 100644
--- a/website/static/js/myProjects.js
+++ b/website/static/js/myProjects.js
@@ -259,7 +259,7 @@ NodeFetcher.prototype = {
           this._flat.push(results.data[i]);
 
       if (this._cache[results.data[i].id]) continue;
-      this._cache[results.data[i].id] = _formatDataforPO(results.data[i]);
+      this._cache[results.data[i].id] = _formatDataForPO(results.data[i]);
       this._cache[results.data[i].id].children = [];
 
       this._orphans = this._orphans.filter((function(item) {
@@ -299,7 +299,7 @@ NodeFetcher.prototype = {
     for(var i = 0; i < results.data.length; i++) {
       //TODO Sorting get a bit broken here @chrisseto
       if (this._cache[parent.id].children.find(finder.bind(this, results.data[i].id))) continue;
-      this._cache[results.data[i].id] = _formatDataforPO(results.data[i]);
+      this._cache[results.data[i].id] = _formatDataForPO(results.data[i]);
       results.data[i].children = [];
       this._cache[parent.id].children.push(results.data[i]);
     }
@@ -346,7 +346,7 @@ function getUID() {
 }
 
 /* Adjust item data for treebeard to be able to filter tags and contributors not in the view */
-function _formatDataforPO(item) {
+function _formatDataForPO(item) {
     item.kind = 'folder';
     item.uid = item.id;
     item.name = $osf.decodeText(item.attributes.title);
@@ -755,7 +755,7 @@ var MyProjects = {
             }
             for (var i = begin; i < data.length; i++){
                 item = data[i];
-                _formatDataforPO(item);
+                _formatDataForPO(item);
                 var child = self.buildTree()(item, self.treeData());
                 self.treeData().add(child);
             }
@@ -1131,7 +1131,7 @@ var MyProjects = {
                 updateFilesData : ctrl.updateFilesData,
                 LinkObject : LinkObject,
                 NodeFetcher : NodeFetcher,
-                formatDataforPO : _formatDataforPO,
+                formatDataForPO : _formatDataForPO,
                 wrapperSelector : args.wrapperSelector,
                 resetUi : ctrl.resetUi,
                 showSidebar : ctrl.showSidebar,
diff --git a/website/static/js/nodeSelectTreebeard.js b/website/static/js/nodeSelectTreebeard.js
index 9022f307e28..f79f834f566 100644
--- a/website/static/js/nodeSelectTreebeard.js
+++ b/website/static/js/nodeSelectTreebeard.js
@@ -53,7 +53,7 @@ function subscribe(item, notification_type) {
         '/api/v1/subscriptions/',
         payload
     ).done(function(){
-        //'notfiy-success' is to override default class 'success' in treebeard
+        //'notify-success' is to override default class 'success' in treebeard
         item.notify.update('Settings updated', 'notify-success', 1, 2000);
         item.data.event.notificationType = notification_type;
     }).fail(function() {
diff --git a/website/static/js/notificationsTreebeard.js b/website/static/js/notificationsTreebeard.js
index 53f89dc4997..d1db5560da7 100644
--- a/website/static/js/notificationsTreebeard.js
+++ b/website/static/js/notificationsTreebeard.js
@@ -52,7 +52,7 @@ function subscribe(item, notification_type) {
         '/api/v1/subscriptions/',
         payload
     ).done(function(){
-        //'notfiy-success' is to override default class 'success' in treebeard
+        //'notify-success' is to override default class 'success' in treebeard
         item.notify.update('Settings updated', 'notify-success', 1, 2000);
         item.data.event.notificationType = notification_type;
     }).fail(function() {
diff --git a/website/static/js/osfHelpers.js b/website/static/js/osfHelpers.js
index 969d5457089..1f1764ed739 100644
--- a/website/static/js/osfHelpers.js
+++ b/website/static/js/osfHelpers.js
@@ -580,7 +580,7 @@ var hasTimeComponent = function(dateString) {
 
 /**
   * A date object with two formats: local time or UTC time.
-  * @param {String} date The original date as a string. Should be an standard
+  * @param {String} date The original date as a string. Should be a standard
   *                      format such as RFC or ISO. If the date is a datetime string
   *                      with no offset, an offset of UTC +00:00 will be assumed. However,
   *                      if the date is just a date (no time component), the time
@@ -659,7 +659,7 @@ var fixAffixWidth = function() {
 };
 
 var initializeResponsiveAffix = function (){
-    // Set nav-box width based on screem
+    // Set nav-box width based on screen
     fixAffixWidth();
     // Show the nav box
     $('.osf-affix').each(function (){
diff --git a/website/static/js/osfLanguage.js b/website/static/js/osfLanguage.js
index f5168d48cd7..ae5e628bb92 100644
--- a/website/static/js/osfLanguage.js
+++ b/website/static/js/osfLanguage.js
@@ -29,7 +29,7 @@ module.exports = {
                 'Dataverse authorization from your <a href="/settings/addons/">user settings</a> ' +
                 'page.',
             deauthError: 'Could not disconnect the Dataverse Account at this time.',
-            deauthSuccess: 'Succesfully disconnected the connected Dataverse Account.',
+            deauthSuccess: 'Successfully disconnected the connected Dataverse Account.',
             authError: 'Sorry, but there was a problem connecting to that instance of Dataverse. It ' +
                 'is likely that the instance hasn\'t been upgraded to Dataverse 4.0. If you ' +
                 'have any questions or believe this to be an error, please contact ' + $osf.osfSupportEmail(),
diff --git a/website/static/js/pages/base-page.js b/website/static/js/pages/base-page.js
index 877239bd271..5dc79417698 100644
--- a/website/static/js/pages/base-page.js
+++ b/website/static/js/pages/base-page.js
@@ -8,7 +8,8 @@ require('../../vendor/bootstrap-editable-custom/css/bootstrap-editable.css');
 require('../../vendor/bower_components/jquery-ui/themes/base/resizable.css');
 require('../../css/bootstrap-xl.css');
 require('../../css/animate.css');
-require('font-awesome-webpack');
+
+import '@fortawesome/fontawesome-free/css/all.css';
 
 var $ = require('jquery');
 var Cookie = require('js-cookie');
diff --git a/website/static/js/pages/project-base-page.js b/website/static/js/pages/project-base-page.js
index 694801978f7..0ea5598fa6e 100644
--- a/website/static/js/pages/project-base-page.js
+++ b/website/static/js/pages/project-base-page.js
@@ -4,7 +4,7 @@ var $ = require('jquery');
 var pointers = require('js/pointers');
 var AccountClaimer = require('js/accountClaimer');
 
-// NodeActions is needed for rendering recent logs in nodelists (e.g. regsitrations and forks
+// NodeActions is needed for rendering recent logs in nodelists (e.g. registrations and forks
 // pages
 require('js/project');
 require('js/licensePicker');
diff --git a/website/static/js/profile.js b/website/static/js/profile.js
index 1b4566a9649..635d7e2ff44 100644
--- a/website/static/js/profile.js
+++ b/website/static/js/profile.js
@@ -932,7 +932,7 @@ ListViewModel.prototype.addContent = function() {
 };
 
 ListViewModel.prototype.removeContent = function(content) {
-    // If there is more then one model, then delete it.  If there is only one, then delete it and add another
+    // If there is more than one model, then delete it.  If there is only one, then delete it and add another
     // to preserve the fields in the view.
     var idx = this.contents().indexOf(content);
     var self = this;
diff --git a/website/static/js/project-organizer.js b/website/static/js/project-organizer.js
index ad3a0e38e5b..5b39e189d8b 100644
--- a/website/static/js/project-organizer.js
+++ b/website/static/js/project-organizer.js
@@ -20,7 +20,7 @@ var iconmap = require('js/iconmap');
 
 var LinkObject;
 var NodeFetcher;
-var formatDataforPO;
+var formatDataForPO;
 var MOBILE_WIDTH = 767;
 
 /**
@@ -434,7 +434,7 @@ var tbOptions = {
             var item;
             for(var i = 0; i < arr.length; i++){
                 item = arr[i];
-                formatDataforPO(item.data);
+                formatDataForPO(item.data);
                 if(item.children.length > 0){
                     formatItems(item.children);
                 }
@@ -448,7 +448,7 @@ var ProjectOrganizer = {
     controller : function (args) {
         LinkObject = args.LinkObject;
         NodeFetcher  = args.NodeFetcher;
-        formatDataforPO = args.formatDataforPO;
+        formatDataForPO = args.formatDataForPO;
         var self = this;
         self.updateTB = function(){
             var poOptions = $.extend(
diff --git a/website/static/js/registrationEditorExtensions.js b/website/static/js/registrationEditorExtensions.js
index d239c852a70..6a748264825 100644
--- a/website/static/js/registrationEditorExtensions.js
+++ b/website/static/js/registrationEditorExtensions.js
@@ -45,7 +45,7 @@ var osfUploader = function(element, valueAccessor, allBindings, viewModel, bindi
         if (filePicker) {
             // A hack to flush the old mithril controller.
             // It's unclear to me exactly why this is happening (after 3hrs), but seems
-            // to be a KO-mithril interaction. We're programattically changing the div
+            // to be a KO-mithril interaction. We're programmatically changing the div
             // containing mithril mountings, and for some reason old controllers (and
             // their bound settings) are persisting and being reused. This call
             // explicity removes the old controller.
diff --git a/website/static/js/registrationRetraction.js b/website/static/js/registrationRetraction.js
index bbd0a706f27..12ac1c44268 100644
--- a/website/static/js/registrationRetraction.js
+++ b/website/static/js/registrationRetraction.js
@@ -40,7 +40,7 @@ var RegistrationRetractionViewModel = oop.extend(
         SUBMIT_ERROR_MESSAGE: 'Error submitting your withdrawal request, please try again. If the problem ' +
                 'persists, email ' + $osf.osfSupportLink(),
         CONFIRMATION_ERROR_MESSAGE: 'Please enter the registration title before clicking Withdraw Registration',
-        JUSTIFICATON_ERROR_MESSAGE: 'Your justification is too long, please enter a justification with no more ' +
+        JUSTIFICATION_ERROR_MESSAGE: 'Your justification is too long, please enter a justification with no more ' +
             'than 2048 characters long.',
         MESSAGE_ERROR_CLASS: 'text-danger',
         onSubmitSuccess: function(response) {
@@ -66,7 +66,7 @@ var RegistrationRetractionViewModel = oop.extend(
                 self.changeMessage(self.CONFIRMATION_ERROR_MESSAGE, self.MESSAGE_ERROR_CLASS);
                 return false;
             } else if (!self.justification.isValid()) {
-                self.changeMessage(self.JUSTIFICATON_ERROR_MESSAGE, self.MESSAGE_ERROR_CLASS);
+                self.changeMessage(self.JUSTIFICATION_ERROR_MESSAGE, self.MESSAGE_ERROR_CLASS);
                 return false;
             } else {
                 // Else Submit
diff --git a/website/static/js/registrationUtils.js b/website/static/js/registrationUtils.js
index b8f95606b6f..6487e13ffe2 100644
--- a/website/static/js/registrationUtils.js
+++ b/website/static/js/registrationUtils.js
@@ -46,7 +46,7 @@ var CACHED_EXTENSIONS = ['osf-author-import'];
  * @class Comment
  * Model for storing/editing/deleting comments on form fields
  *
- * @param {Object} data: optional data to instatiate model with
+ * @param {Object} data: optional data to instantiate model with
  * @param {User} data.user
  * @param {Date string} data.lastModified
  * @param {Date string} data.created
@@ -461,7 +461,7 @@ var MetaSchema = function(params, schemaData) {
     self.schema = params.schema || {};
     self.id = params.id;
 
-    // Used for initally selecting a schema
+    // Used for initially selecting a schema
     self._selected = ko.observable(false);
 
     self.requiresApproval = params.requires_approval || false;
@@ -785,7 +785,7 @@ Draft.prototype.reject = function() {
  * @property {ko.observable[Boolean]} readonly
  * @property {ko.observable[Draft]} draft
  * @property {ko.observable[Question]} currentQuestion
- * @property {Object} extensions: mapping of extenstion names to their view models
+ * @property {Object} extensions: mapping of extension names to their view models
  **/
 var RegistrationEditor = function(urls, editorId, preview) {
     var self = this;
@@ -835,7 +835,7 @@ var RegistrationEditor = function(urls, editorId, preview) {
     });
     self.currentPage.subscribe(function(page) {
         // lazily apply subscriptions to question values
-        // TODO: dispose subscriptions to last page? Probably unncessary.
+        // TODO: dispose subscriptions to last page? Probably unnecessary.
         $.each(page.questions, function(_, question) {
             question.value.subscribe(function() {
                 self.dirtyCount(self.dirtyCount() + 1);
diff --git a/website/static/js/search.js b/website/static/js/search.js
index daf997bc0f5..53c23b505ce 100644
--- a/website/static/js/search.js
+++ b/website/static/js/search.js
@@ -587,7 +587,7 @@ function Search(selector, url, appURL) {
         scrollTop: 0,
         filter: $osf.urlParams().filter
     };
-    //Ensure our state keeps its URL paramaters
+    //Ensure our state keeps its URL parameters
     history.replaceState(data, 'OSF | Search', location.search);
     //Set out observables from the newly replaced state
     self.viewModel.loadState();
diff --git a/website/static/maintenance/assets/MyFontsWebfontsKit.css b/website/static/maintenance/assets/MyFontsWebfontsKit.css
index 73585d4411d..ca82fa7779d 100644
--- a/website/static/maintenance/assets/MyFontsWebfontsKit.css
+++ b/website/static/maintenance/assets/MyFontsWebfontsKit.css
@@ -20,7 +20,7 @@
 */
 
 
-/* @import must be at top of file, otherwise CSS will not work */
+/* @import must be at top of file; otherwise, CSS will not work */
 @import url("//hello.myfonts.net/count/2d2d54");
 
 
diff --git a/website/static/tmp/American_Economic_Review_Resgistration.txt b/website/static/tmp/American_Economic_Review_Registration.txt
similarity index 100%
rename from website/static/tmp/American_Economic_Review_Resgistration.txt
rename to website/static/tmp/American_Economic_Review_Registration.txt
diff --git a/website/static/tmp/EGAP_Project.txt b/website/static/tmp/EGAP_Project.txt
index 5a087a18883..e3caefe0985 100644
--- a/website/static/tmp/EGAP_Project.txt
+++ b/website/static/tmp/EGAP_Project.txt
@@ -89,7 +89,7 @@
     </div>
 
     <div class="control-group">
-  <label class="control-label">Has this research received Insitutional Review Board (IRB) or ethics committee approval?</label>
+  <label class="control-label">Has this research received Institutional Review Board (IRB) or ethics committee approval?</label>
   <div class="controls">
     {{view Ember.Select
        contentBinding="Template.yesnoother.content"
diff --git a/website/static/urlValidatorTest.json b/website/static/urlValidatorTest.json
index 04967c0c54e..ff03806c2c3 100644
--- a/website/static/urlValidatorTest.json
+++ b/website/static/urlValidatorTest.json
@@ -27,7 +27,7 @@
     "http://staging.damowmow.com/":"should accept valid website with sub-domain",
     "http://☺.damowmow.com/":"should accept valid website with unicode in sub-domain",
     "http://code.google.com/events/#&product=browser":"should accept valid website with variables",
-    "ftp://foo.bar/baz":"should acccept valid website with ftps",
+    "ftp://foo.bar/baz":"should accept valid website with ftps",
     "http://foo.bar/?q=Test%20URL-encoded%20stuff":"should accept valid website with encoded stuff in path",
     "http://مثال.إختبار":"should accept valid unicode heavy website test 1",
     "http://例子.测试":"should accept valid unicode heavy website test 2",
diff --git a/website/static/vendor/dropzone/dropzone.js b/website/static/vendor/dropzone/dropzone.js
index 7f60f4a34ad..cf4e2854c37 100644
--- a/website/static/vendor/dropzone/dropzone.js
+++ b/website/static/vendor/dropzone/dropzone.js
@@ -444,7 +444,7 @@ require.register("dropzone/lib/dropzone.js", function(exports, require, module){
       dictCancelUploadConfirmation: "Are you sure you want to cancel this upload?",
       dictRemoveFile: "Remove file",
       dictRemoveFileConfirmation: null,
-      dictMaxFilesExceeded: "You can not upload any more files.",
+      dictMaxFilesExceeded: "You cannot upload any more files.",
       accept: function(file, done) {
         return done();
       },
diff --git a/website/templates/base.mako b/website/templates/base.mako
index 642f8ffa03c..51abe36b06a 100644
--- a/website/templates/base.mako
+++ b/website/templates/base.mako
@@ -142,53 +142,78 @@
         <div id='devmode' data-bind='click: showHideMetaInfo'><strong>WARNING</strong>: This site is running in development mode.</div>
     </div>
     % endif
+    <div class="main-wrapper">
+        ${self.nav()}
+        <div class="content-wrapper">
+            <div class="container-fluid">
+                <div class="row">
+                    <div class="col">
+                        ## Maintenance alert
+                        % if maintenance:
+                            <div id="maintenance" class="scripted alert alert-dismissible" role="alert">
+                            <button type="button" class="close" data-dismiss="alert" aria-label="Close">
+                                <span aria-hidden="true">&times;</span></button>
+                            <strong>Notice:</strong>
+                            % if maintenance['message']:
+                                ${maintenance['message']}
+                            % else:
+                                The site will undergo maintenance between <span id="maintenanceTime"></span>.
+                                Thank you for your patience.
+                            % endif
+                        </div>
+                        % endif
+                        ## End Maintenance alert
+                    </div>
+                </div>
+            </div>
+            ## TODO: shouldn't always have the watermark class
+            <div class="main-content flex-grow-1">
+                ${self.content_wrap()}
+            </div>
 
-    ${self.nav()}
-     ## TODO: shouldn't always have the watermark class
-    ${self.content_wrap()}
 
-<div class="footBanners">
-    <div id="IEDepreciationBanner"  class="alert warningBanner">
-        <div class="warningBannerText">
-            OSF does not support the use of Internet Explorer. For optimal performance, please switch to another browser.
-        </div>
-        <div class="warningBannerAcceptBtn">
-            <div class="btn btn-default" data-dismiss="alert" data-bind="click: accept" aria-label="Accept">Accept</div>
-        </div>
-    </div>
-    % if not user_id:
-    <div id="cookieBanner" class="alert warningBanner">
-        <div id="cookieText" class="warningBannerText">
-            This website relies on cookies to help provide a better user experience. By clicking Accept or continuing to use the site, you agree. For more information,
-            see our <a href='https://github.com/CenterForOpenScience/cos.io/blob/master/PRIVACY_POLICY.md'>Privacy Policy</a>
-            and information on <a href='https://github.com/CenterForOpenScience/cos.io/blob/master/PRIVACY_POLICY.md#7-types-of-information-we-collect'>cookie use</a>.
-        </div>
-        <div class="warningBannerAcceptBtn">
-            <div class="btn btn-default" data-dismiss="alert" data-bind="click: accept" aria-label="Accept">Accept</div>
-        </div>
-    </div>
-    <div id="footerSlideIn">
-        <div class="container">
-            <div class="row">
-                <div class='col-sm-2 hidden-xs'>
-                    <img class="logo" src="/static/img/circle_logo.png">
+            <div class="footBanners">
+                <div id="IEDepreciationBanner"  class="alert warningBanner">
+                    <div class="warningBannerText">
+                        OSF does not support the use of Internet Explorer. For optimal performance, please switch to another browser.
+                    </div>
+                    <div class="warningBannerAcceptBtn">
+                        <div class="btn btn-default" data-dismiss="alert" data-bind="click: accept" aria-label="Accept">Accept</div>
+                    </div>
                 </div>
-                <div class='col-sm-10 col-xs-12'>
-                    <a data-bind="click: dismiss" class="close" href="#">&times;</a>
-                    <h1>Start managing your projects on the OSF today.</h1>
-                    <p>Free and easy to use, the Open Science Framework supports the entire research lifecycle: planning, execution, reporting, archiving, and discovery.</p>
-                    <div>
-                        <a data-bind="click: trackClick.bind($data, 'Create Account')" class="btn btn-primary" href="${web_url_for('index')}#signUp">Create an Account</a>
-
-                        <a data-bind="click: trackClick.bind($data, 'Learn More')" class="btn btn-primary" href="https://help.osf.io/article/384-managing-projects" target="_blank" rel="noreferrer">Learn More</a>
-                        <a data-bind="click: dismiss">Hide this message</a>
+                % if not user_id:
+                <div id="cookieBanner" class="alert warningBanner">
+                    <div id="cookieText" class="warningBannerText">
+                        This website relies on cookies to help provide a better user experience. By clicking Accept or continuing to use the site, you agree. For more information,
+                        see our <a href='https://github.com/CenterForOpenScience/cos.io/blob/master/PRIVACY_POLICY.md'>Privacy Policy</a>
+                        and information on <a href='https://github.com/CenterForOpenScience/cos.io/blob/master/PRIVACY_POLICY.md#7-types-of-information-we-collect'>cookie use</a>.
+                    </div>
+                    <div class="warningBannerAcceptBtn">
+                        <div class="btn btn-default" data-dismiss="alert" data-bind="click: accept" aria-label="Accept">Accept</div>
+                    </div>
+                </div>
+                <div id="footerSlideIn">
+                    <div class="container">
+                        <div class="row">
+                            <div class='col-sm-2 hidden-xs'>
+                                <img class="logo" src="/static/img/circle_logo.png">
+                            </div>
+                            <div class='col-sm-10 col-xs-12'>
+                                <a data-bind="click: dismiss" class="close" href="#">&times;</a>
+                                <h1>Start managing your projects on the OSF today.</h1>
+                                <p>Free and easy to use, the Open Science Framework supports the entire research lifecycle: planning, execution, reporting, archiving, and discovery.</p>
+                                <div>
+                                    <a data-bind="click: trackClick.bind($data, 'Create Account')" class="btn btn-primary" href="${web_url_for('index')}#signUp">Create an Account</a>
+
+                                    <a data-bind="click: trackClick.bind($data, 'Learn More')" class="btn btn-primary" href="https://help.osf.io/article/384-managing-projects" target="_blank" rel="noreferrer">Learn More</a>
+                                    <a data-bind="click: dismiss">Hide this message</a>
+                                </div>
+                            </div>
+                        </div>
                     </div>
                 </div>
             </div>
-        </div>
-    </div>
-</div>
-% endif
+            % endif
 
 
     ${self.footer()}
@@ -279,6 +304,8 @@
         % endif
 
         ${self.javascript_bottom()}
+    </div>
+</div>
     </body>
 </html>
 
@@ -383,7 +410,7 @@
 </%def>
 
 <%def name="javascript_bottom()">
-    ### Javascript loaded at the bottom of the page ###
+    ### JavaScript loaded at the bottom of the page ###
 </%def>
 
 <%def name="footer()">
@@ -401,7 +428,7 @@
                 ${self.alert()}
             % endif
 
-            ### A11y Reccommended header
+            ### A11y Recommended header
             <h1 style="display: none;">Main content</h1>
             ${self.content()}
         </div><!-- end container -->
diff --git a/website/templates/emails/addons_boa_job_failure.html.mako b/website/templates/emails/addons_boa_job_failure.html.mako
index 5ed46a042d7..93cfbaf72e5 100644
--- a/website/templates/emails/addons_boa_job_failure.html.mako
+++ b/website/templates/emails/addons_boa_job_failure.html.mako
@@ -12,7 +12,7 @@
         Your submission of file [${query_file_full_path}] from <a href="${project_url}">your OSF project</a> to Boa has failed. <br>
         <br>
         % if code == 1:
-            OSF can not log in to Boa. Please fix your Boa addon configuration on OSF and try again. <br>
+            OSF cannot log in to Boa. Please fix your Boa addon configuration on OSF and try again. <br>
             <br>
             For details, visit <a href="${boa_job_list_url}">Boa's job list page</a>. The Boa job ID for this submission is [${job_id}]. <br>
         % elif code == 2:
diff --git a/website/templates/emails/collection_submission_removed_private.html.mako b/website/templates/emails/collection_submission_removed_private.html.mako
index eeac5728f30..29772592827 100644
--- a/website/templates/emails/collection_submission_removed_private.html.mako
+++ b/website/templates/emails/collection_submission_removed_private.html.mako
@@ -25,7 +25,7 @@
             % else:
                 <a href="${settings.DOMAIN + 'myprojects/'}">${collection.provider.name}</a>
             % endif
-            It will need to be re-submitteds to be included in the collection again.
+            It will need to be re-submitted to be included in the collection again.
         % endif
     </p>
     <p>
diff --git a/website/templates/emails/collection_submission_submitted.html.mako b/website/templates/emails/collection_submission_submitted.html.mako
index ce774878aa0..c2c68a2395d 100644
--- a/website/templates/emails/collection_submission_submitted.html.mako
+++ b/website/templates/emails/collection_submission_submitted.html.mako
@@ -8,7 +8,7 @@
         Hello ${user.fullname},<br>
         <br>
         <p>
-            % if is_initator:
+            % if is_initiator:
                 You just started a request to add <a href="${node.absolute_url}">${node.title}</a>
                 to <a href="${settings.DOMAIN + 'collections/' + collection.provider._id}">${collection.provider.name}</a>.
                 All admins and contributors will be notified via email.
diff --git a/website/templates/emails/pending_embargo_termination_admin.html.mako b/website/templates/emails/pending_embargo_termination_admin.html.mako
index cfe2642d521..9441ec56ff0 100644
--- a/website/templates/emails/pending_embargo_termination_admin.html.mako
+++ b/website/templates/emails/pending_embargo_termination_admin.html.mako
@@ -15,7 +15,7 @@
     % endif
     </p>
     <p>
-    If all admin contributors appove, the registration will be made public as part of the
+    If all admin contributors approve, the registration will be made public as part of the
     <a href="${settings.DOMAIN}/registries/${reviewable.provider._id if reviewable.provider else 'osf'}">${reviewable.provider.name if reviewable.provider else "OSF Registry"}</a>.
     </p>
     <p style="color:red;">
diff --git a/website/templates/emails/pending_embargo_termination_non_admin.html.mako b/website/templates/emails/pending_embargo_termination_non_admin.html.mako
index f345adaae6a..ebdaa224e00 100644
--- a/website/templates/emails/pending_embargo_termination_non_admin.html.mako
+++ b/website/templates/emails/pending_embargo_termination_non_admin.html.mako
@@ -10,7 +10,7 @@
     titled <a href="${registration_link}">${reviewable.title}</a>
     </p>
     <p>
-    If all admins contributors appove, the registration will be made public as part of the
+    If all admins contributors approve, the registration will be made public as part of the
     <a href="${settings.DOMAIN}/registries/${reviewable.provider._id if reviewable.provider else 'osf'}">${reviewable.provider.name if reviewable.provider else "OSF Registry"}</a>.
     </p>
     <p>
diff --git a/website/templates/emails/request_deactivation_complete.html.mako b/website/templates/emails/request_deactivation_complete.html.mako
index 6ef726186e3..8e90b40c779 100644
--- a/website/templates/emails/request_deactivation_complete.html.mako
+++ b/website/templates/emails/request_deactivation_complete.html.mako
@@ -7,7 +7,7 @@
     <br>
     <br>
 
-    Your OSF account has been deactivated. You will not show up in search, nor will a profile be visible for you.
+    Your OSF account has been deactivated. You will not show up in search, nor will your profile be visible.
     If you try to log in, you will receive an error message that your account has been disabled. If, in the future,
     you would like to create an account with this email address, you can do so by emailing us at ${contact_email}.
 
diff --git a/website/templates/emails/updates_pending_approval.html.mako b/website/templates/emails/updates_pending_approval.html.mako
index 5b595be7c82..ebff61ca31c 100644
--- a/website/templates/emails/updates_pending_approval.html.mako
+++ b/website/templates/emails/updates_pending_approval.html.mako
@@ -19,7 +19,7 @@
       submitted updates. Decisions must be made within
       ${int(settings.REGISTRATION_UPDATE_APPROVAL_TIME.total_seconds() / 3600)} hours.
     % else:
-      <a href="${update_url}">Click here</a> to review the submited updates.
+      <a href="${update_url}">Click here</a> to review the submitted updates.
       Admins have up to ${int(settings.REGISTRATION_UPDATE_APPROVAL_TIME.total_seconds() / 3600)} hours
       to make their decision.
     % endif
diff --git a/website/templates/erpc_landing_page.mako b/website/templates/erpc_landing_page.mako
index 77074f783fc..07368fe72dd 100644
--- a/website/templates/erpc_landing_page.mako
+++ b/website/templates/erpc_landing_page.mako
@@ -19,7 +19,7 @@
         Please note that many studies created as part of this competition will remain private for up to four years from the date of creation.
     </p>
     <br>
-    <p>A blank version of the Election Research Preacceptance Competition form is available <a href="https://osf.io/pu4xc/">here</a>. </p>
+    <p>A <a href="https://osf.io/pu4xc/">blank version of the Election Research Preacceptance Competition form</a> is available. </p>
     <br>
     <p>If you'd like to preregister another study, please see the Preregistration Challenge
         <a href="https://cos.io/prereg/">information page</a> or get started on your next preregistration
diff --git a/website/templates/external_login_email.mako b/website/templates/external_login_email.mako
index 69c3c168c81..ba24eb68f3a 100644
--- a/website/templates/external_login_email.mako
+++ b/website/templates/external_login_email.mako
@@ -1,35 +1,40 @@
 <%inherit file="base.mako"/>
 <%def name="title()">OSF ${external_id_provider} Login</%def>
 <%def name="content()">
-<h1 class="page-header text-center">OSF ${external_id_provider} Login | Register Email</h1>
+<h1 class="page-header text-center">Sign In With ${external_id_provider}</h1>
 
 <div class="row">
     ## Center the form
     <div class="col-md-6 col-md-offset-3">
-        <p class='help'>
-            Please enter your email to finalize the login.
-            If you already have an OSF account, this will link your ${external_id_provider} profile with OSF.
-            If not, this will create a new account for you with your ${external_id_provider} profile.
-        </p>
-
-        <form id='resendForm' method='POST' class='form' role='form'>
-            % if not auth_user_fullname:
+        % if status_message:
+        <p class="alert alert-success">${status_message}</p>
+        % else:
+            <p>Please enter your email to finalize your ${external_id_provider} login.</p>
+            <p>If you already have an OSF account, this will link your ${external_id_provider} profile with OSF. If not, this will create a new account for you with your ${external_id_provider} profile.</p>
+            <form id='resendForm' method='POST' class='form' role='form'>
                 <div class='form-group'>
                     Full name:
                     ${form.name(placeholder='Albert Einstein', autofocus=True, required='required') | unicode, n }
                 </div>
-            % endif
-            <div class='form-group'>
-                Email address:
-                ${form.email(placeholder='support@osf.io', autofocus=True, required=True) | unicode, n }
-            </div>
-            <div class='form-group'>
-                ${form.accepted_terms_of_service(required='required') | unicode, n }
-                <label>I have read and agree to the <a target="_blank" href='https://github.com/CenterForOpenScience/cos.io/blob/master/TERMS_OF_USE.md'>Terms of Use</a> and <a target="_blank" href='https://github.com/CenterForOpenScience/cos.io/blob/master/PRIVACY_POLICY.md'>Privacy Policy</a>.</label>
-            </div>
-            <button type='submit' class='btn btn-primary'>Send</button>
-            <a href='/logout' class='btn btn-danger'>Cancel</a>
-        </form>
+                <div class='form-group'>
+                    Email address:
+                    ${form.email(placeholder='support@osf.io', autofocus=True, required=True) | unicode, n }
+                </div>
+                % if error_list:
+                    % for error in error_list:
+                         <div class="alert alert-danger">${error}</div>
+                    % endfor
+                % endif
+                <div class='form-group'>
+                    ${form.accepted_terms_of_service(required='required') | unicode, n }
+                    <label>I have read and agree to the <a target="_blank" href='https://github.com/CenterForOpenScience/cos.io/blob/master/TERMS_OF_USE.md'>Terms of Use</a> and <a target="_blank" href='https://github.com/CenterForOpenScience/cos.io/blob/master/PRIVACY_POLICY.md'>Privacy Policy</a>.</label>
+                </div>
+                <div class='border-top flex-row gap-1 padding-top-2'>
+                    <a href='/logout' class='btn btn-secondary flex-grow-1'>Cancel</a>
+                    <button type='submit' class='btn btn-primary flex-grow-1'>Send</button>
+                </div>
+            </form>
+        % endif
     </div>
 </div>
 </%def>
diff --git a/website/templates/footer.mako b/website/templates/footer.mako
index b6ddc4f7637..8a8dac29638 100644
--- a/website/templates/footer.mako
+++ b/website/templates/footer.mako
@@ -1,63 +1,61 @@
+
 <% from datetime import datetime %>
-<div style="padding-top: 10px; margin-top: 20px; text-shadow: 0 1px 0 #fff; width: 100%; color: #515151; text-align: center; background-color: #efefef;">
-    <div class="container-fluid">
-        <div class="row">
-            <div class="col-sm-12 col-md-8 col-md-offset-2">
-                <p class="footer-links">
-                    <span>
-                        Copyright &copy; 2011-${datetime.utcnow().year}
-                    </span>
-                    <a href="${footer_links['cos']}">
-                        Center for Open Science
-                    </a>
-                    <span>
-                        |
-                    </span>
-                    <a href="${footer_links['terms']}">
-                        Terms&nbsp;of&nbsp;Use
-                    </a>
-                    <span>
-                        |
-                    </span>
-                    <a href="${footer_links['privacyPolicy']}">
-                        Privacy&nbsp;Policy
-                    </a>
-                    <span>
-                        |
-                    </span>
-                    <a href="${footer_links['statusPage']}">
-                        Status
-                    </a>
-                    <span>
-                        |
-                    </span>
-                    <a href="${footer_links['apiDocs']}">
-                        API
-                    </a>
-                    <br>
-                    <a href="${footer_links['topGuidelines']}">
-                        TOP Guidelines
-                    </a>
-                    <span>
-                        |
-                    </span>
-                    <a href="${footer_links['rpp']}">
-                        Reproducibility&nbsp;Project: Psychology
-                    </a>
-                    <span>
-                        |
-                    </span>
-                    <a href="${footer_links['rpcb']}">
-                        Reproducibility&nbsp;Project: Cancer Biology
-                    </a>
-                </p>
-                <p>
-                    <a href="${footer_links['twitter']}" aria-label="Twitter"><i class="fa fa-twitter fa-2x"></i></a>
-                    <a href="${footer_links['facebook']}" aria-label="Facebook"><i class="fa fa-facebook fa-2x"></i></a>
-                    <a href="${footer_links['googleGroup']}" aria-label="Google Group"><i class="fa fa-group fa-2x"></i></a>
-                    <a href="${footer_links['github']}" aria-label="GitHub"><i class="fa fa-github fa-2x"></i></a>
-                </p>
-            </div>
-        </div>
+<div class="footer-wrapper">
+    <div class="footer-row">
+        <span>
+            <a href="${footer_links['cos']}">
+                Center for Open Science
+            </a>
+        </span>
+        <div class="footer-social-links-list">
+            <a class="footer-logo" href="${footer_links['github']}" aria-label="Twitter">
+                <span class="fa-stack">
+                    <i class="fa-brands fa-github-square fa-2x"></i>
+                </span>
+            </a>
+            <a class="footer-logo" href="${footer_links['github']}" aria-label="LinkedIn">
+                <span class="fa-stack">
+                    <i class="fa-brands fa-linkedin fa-2x"></i>
+                </span>
+            </a>
+            <a class="footer-logo" href="${footer_links['github']}" aria-label="Bluesky">
+                <span class="fa-stack">
+                    <i class="fa-solid fa-square fa-stack-2x"></i>
+                    <i class="fa-brands fa-bluesky fa-stack-1x fa-inverse"></i>
+                </span>
+            </a>
+            <a class="footer-logo" href="${footer_links['github']}" aria-label="Mastodon">
+                <span class="fa-stack">
+                    <i class="fa-solid fa-square fa-stack-2x"></i>
+                    <i class="fa-brands fa-mastodon fa-stack-1x fa-inverse"></i>
+                </span>
+            </a>
+        </span>
     </div>
+</div>
+<div class="footer-row">
+    <div class="footer-links-list">
+        <a href="${footer_links['terms']}">
+            Terms&nbsp;of&nbsp;Use
+        </a>
+        |
+        <a href="${footer_links['privacyPolicy']}">
+            Privacy&nbsp;Policy
+        </a>
+        |
+        <a href="${footer_links['statusPage']}">
+            Status
+        </a>
+        |
+        <a href="${footer_links['apiDocs']}">
+            API
+        </a>
+        |
+        <a href="${footer_links['topGuidelines']}">
+            TOP Guidelines
+        </a>
+    </div>
+    <span>
+        Copyright &copy; 2011-${datetime.utcnow().year}
+    </span>
 </footer>
diff --git a/website/templates/nav.mako b/website/templates/nav.mako
index ce9733291eb..288dbe069e7 100644
--- a/website/templates/nav.mako
+++ b/website/templates/nav.mako
@@ -2,117 +2,136 @@
 <link rel="stylesheet" href='/static/css/nav.css'>
 <div class="osf-nav-wrapper" role="navigation">
 
-<nav class="navbar navbar-inverse navbar-fixed-top" id="navbarScope">
-    <div class="container">
-        <div class="navbar-header">
-        <a class="navbar-brand" href="/" aria-label="Go home"><span class="osf-navbar-logo"></span></a>
-        <div class="service-name">
-            <a href="${service_url}">
-                <span class="hidden-xs"> OSF </span>
-                <span class="current-service"><strong>${service_name}</strong></span>
-            </a>
-        </div>
-        <div class="dropdown primary-nav">
-            <button data-bind="click: trackClick.bind($data, 'Dropdown Arrow')" class="dropdown-toggle btn-link" data-toggle="dropdown" aria-expanded="false" aria-label="Toggle primary navigation">
-                <span class="fa fa-caret-down fa-2x"></span>
-            </button>
-            <ul class="dropdown-menu service-dropdown" role="menu">
-                <li><a data-bind="click: trackClick.bind($data, 'Home')" href="${domain}">OSF<b>HOME</b></a></li>
-                <li><a data-bind="click: trackClick.bind($data, 'Preprints')" href="${domain}preprints/">OSF<b>PREPRINTS</b></a></li>
-                <li><a data-bind="click: trackClick.bind($data, 'Registries')" href="${domain}registries/">OSF<b>REGISTRIES</b></a></li>
-                <li><a data-bind="click: trackClick.bind($data, 'Meetings')" href="${domain}meetings/">OSF<b>MEETINGS</b></a></li>
-                % if institutional_landing_flag:
-                    <li><a data-bind="click: trackClick.bind($data, 'Institutions')" href="${domain}institutions/">OSF<b>INSTITUTIONS</b></a></li>
-                % endif
+<nav class="navbar navbar-fixed-top mobile-only">
+    <span class="left-logo"><span class="osf-navbar-logo"></span>OSF</span>
+    <input type="checkbox" id="toggle-leftnav" class="toggle-nav-input" aria-controls='slideout-nav' hidden/>
+    <label for="toggle-leftnav" class="toggle-nav-label mobile-only" aria-label="Toggle navigation menu">
+        <i class="fa fa-bars fa-2x"></i>
+    </label>
+    <!-- Sliding left nav -->
+    <aside id="slideout-nav" class="left-pane left-pane-nav slideout mobile-only">
+        <nav>
+            <ul class='left-pane-ul'>
+                <li>
+                    <a data-bind="click: trackClick.bind($data, 'Home')" href="${domain}">
+                        <i class="fa fa-home"></i>
+                        Home
+                    </a>
+                </li>
+                <li>
+                    <a data-bind="click: trackClick.bind($data, 'Search')" href="${domain}search/">
+                        <i class="fa fa-search"></i>
+                        Search
+                    </a>
+                </li>
+                <li>
+                    <a data-bind="click: trackClick.bind($data, 'Support')" href="${service_support_url}">
+                        <i class="fa fa-headset"></i>
+                        Support
+                    </a>
+                </li>
             </ul>
-        </div>
-        <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#secondary-navigation" aria-label="Toggle secondary navigation"}}>
-            <span class="sr-only">Toggle navigation</span>
-            <span class="icon-bar"></span>
-            <span class="icon-bar"></span>
-            <span class="icon-bar"></span>
-        </button>
-    </div>
-    <div id="navbar" class="navbar-collapse collapse navbar-right">
-        <ul class="nav navbar-nav"></ul>
-    </div><!--/.navbar-collapse -->
-
-    <div class="navbar-collapse collapse navbar-right" id="secondary-navigation">
-        <ul class="nav navbar-nav">
-            % if service_name == 'HOME':
-                % if user_name:
-                    <li><a data-bind="click: trackClick.bind($data, 'MyProjects')" href="${domain}myprojects/">My Projects</a></li>
-                % endif
-                    <li><a id="navbar-search" data-bind="click: trackClick.bind($data, 'Search')" href="${domain}search/">Search</a></li>
-            % endif
-            <li class="dropdown">
-            <a id="navbar-support" data-bind="click: trackClick.bind($data, '${service_name} Support')" href="${service_support_url}">Support</a>
-            </li>
-            <li class="navbar-donate-button"><a id="navbar-donate" data-bind="click: trackClick.bind($data, 'Donate')" href="https://cos.io/donate">Donate</a></li>
-            % if user_name and display_name:
-            <li class="dropdown secondary-nav-dropdown">
-                <a class="dropdown-toggle btn-link" data-toggle="dropdown" role="button" aria-expanded="false" aria-label="Toggle auth dropdown">
-                    <div class="osf-profile-image">
-                        <img src="${user_profile_image}" alt="User profile image">
-                    </div>
-                    <div class="nav-profile-name">
-                            ${display_name}
-                    </div>
-                    <div class="caret"></div>
-                </a>
-
-                <ul class="dropdown-menu auth-dropdown" role="menu">
-                    <li><a data-bind="click: trackClick.bind($data, 'MyProfile')" href="${domain}profile/"><i class="fa fa-user fa-lg p-r-xs"></i> My Profile</a></li>
-                    <li><a data-bind="click: trackClick.bind($data, 'Support')" href="https://help.osf.io/" ><i class="fa fa-life-ring fa-lg p-r-xs"></i> OSF Support</a></li>
-                    <li><a data-bind="click: trackClick.bind($data, 'Settings')" href="${web_url_for('user_profile')}"><i class="fa fa-cog fa-lg p-r-xs"></i> Settings</a></li>
-                    <li><a data-bind="click: trackClick.bind($data, 'Logout')" href="${web_url_for('auth_logout')}"><i class="fa fa-sign-out fa-lg p-r-xs"></i> Log out</a></li>
-                </ul>
-            </li>
-            % elif allow_login:
-                %if institution:
-                    <li class="dropdown sign-in">
-                    <div class="btn-group">
-                        <a href="${domain}login/?campaign=institution&next=${redirect_url}">
-                            <button type="button" class="btn btn-info btn-top-login">
-                            Sign in <span class="hidden-xs"><i class="fa fa-arrow-right"></i></span>
-                            </button>
-                        </a>
-                    </div>
-                    </li>
-                %else :
-                <li class="dropdown sign-in">
-                    <div class="col-sm-12">
-                        <a data-bind="click: trackClick.bind($data, 'SignUp')" href="${sign_up_url}" class="btn btn-success btn-top-signup m-r-xs">Sign Up</a>
-                        <a data-bind="click: trackClick.bind($data, 'SignIn')" href="${login_url}" class="btn btn-info btn-top-login p-sm">Sign In</a>
-                    </div>
+            <ul class='left-pane-ul'>
+                <li>
+                    <a data-bind="click: trackClick.bind($data, 'Registries')" href="${domain}registries/">
+                        <img class="social-icons" src="/static/img/left-nav-icons/registries.svg" title="Registries" alt="Registries icon">
+                        Registries
+                        <i class="fa fa-chevron-right chevron-right"></i>
+                    </a>
                 </li>
-                %endif
-            % endif
-
-        </ul>
-    </div>
-</div>
+                <li>
+                    <a data-bind="click: trackClick.bind($data, 'Preprints')" href="${domain}preprints/">
+                        <img class="social-icons" src="/static/img/left-nav-icons/preprints.svg" title="Preprints" alt="Preprints icon">
+                        Preprints
+                        <i class="fa fa-chevron-right chevron-right"></i>
+                    </a>
+                </li>
+                <li>
+                    <a data-bind="click: trackClick.bind($data, 'Meetings')" href="${domain}meetings/">
+                        <img class="social-icons" src="/static/img/left-nav-icons/meetings.svg" title="Meetings" alt="Meetings icon">
+                        Meetings
+                    </a>
+                </li>
+                <li>
+                    <a data-bind="click: trackClick.bind($data, 'Institutions')" href="${domain}institutions/">
+                        <i class="fa fa-university"></i>
+                        Institutions
+                    </a>
+                </li>
+            </ul>
+            <ul class='left-pane-ul'>
+                <li>
+                    <a data-bind="click: trackClick.bind($data, 'Donate')" href="https://www.cos.io/support-cos">
+                        <i class="fa fa-hand-holding-dollar"></i>
+                        Donate
+                    </a>
+                </li>
+            </ul>
+        </nav>
+    </aside>
 </nav>
-    <div class="container-fluid">
-        <div class="row">
-            <div class="col">
-                ## Maintenance alert
-                % if maintenance:
-                    <div id="maintenance" class="scripted alert alert-dismissible" role="alert">
-                    <button type="button" class="close" data-dismiss="alert" aria-label="Close">
-                        <span aria-hidden="true">&times;</span></button>
-                    <strong>Notice:</strong>
-                    % if maintenance['message']:
-                        ${maintenance['message']}
-                    % else:
-                        The site will undergo maintenance between <span id="maintenanceTime"></span>.
-                        Thank you for your patience.
-                    % endif
-                </div>
-                % endif
-                ## End Maintenance alert
-            </div>
-        </div>
+
+
+<!-- Left nav for desktop --->
+<nav class="left-pane-nav desktop-only" id="leftnavScope">
+    <div>
+        <span class="left-logo"><span class="osf-navbar-logo"></span>OSF</span>
     </div>
+    <ul class='left-pane-ul'>
+        <li>
+            <a data-bind="click: trackClick.bind($data, 'Home')" href="${domain}">
+                <i class="fa fa-home"></i>
+                Home
+            </a>
+        </li>
+        <li>
+            <a data-bind="click: trackClick.bind($data, 'Search')" href="${domain}search/">
+                <i class="fa fa-search"></i>
+                Search
+            </a>
+        </li>
+        <li>
+            <a data-bind="click: trackClick.bind($data, 'Support')" href="${service_support_url}">
+                <i class="fa fa-headset"></i>
+                Support
+            </a>
+        </li>
+    </ul>
+    <ul class='left-pane-ul'>
+        <li>
+            <a data-bind="click: trackClick.bind($data, 'Registries')" href="${domain}registries/">
+                <img src="/static/img/left-nav-icons/registries.svg" title="Registries" alt="Registries icon">
+                Registries
+                <i class="fa fa-chevron-right chevron-right"></i>
+            </a>
+        </li>
+        <li>
+            <a data-bind="click: trackClick.bind($data, 'Preprints')" href="${domain}preprints/">
+                <img src="/static/img/left-nav-icons/preprints.svg" title="Preprints" alt="Preprints icon">
+                Preprints
+                <i class="fa fa-chevron-right chevron-right"></i>
+            </a>
+        </li>
+        <li>
+            <a data-bind="click: trackClick.bind($data, 'Meetings')" href="${domain}meetings/">
+                <img src="/static/img/left-nav-icons/meetings.svg" title="Meetings" alt="Meetings icon">
+                Meetings
+            </a>
+        </li>
+        <li>
+            <a data-bind="click: trackClick.bind($data, 'Institutions')" href="${domain}institutions/">
+                <i class="fa fa-university"></i>
+                Institutions
+            </a>
+        </li>
+    </ul>
+    <ul class='left-pane-ul'>
+        <li>
+            <a data-bind="click: trackClick.bind($data, 'Donate')" href="https://www.cos.io/support-cos">
+                <i class="fa fa-hand-holding-dollar"></i>
+                Donate
+            </a>
+        </li>
+    </ul>
 </div>
 </%def>
diff --git a/website/templates/policies/generic_policy.mako b/website/templates/policies/generic_policy.mako
index 6ae8581d350..78d90e56733 100644
--- a/website/templates/policies/generic_policy.mako
+++ b/website/templates/policies/generic_policy.mako
@@ -9,7 +9,7 @@
         </div>
         <div class="col-md-12">
             <br>
-            Version history for this policy is available <a href='${POLICY_GITHUB_LINK}'>here</a>
+            <a href='${POLICY_GITHUB_LINK}'>Version history for this policy</a> is available.
         </div>
     </div>
 </div><!-- end container policy -->
diff --git a/website/templates/project/addon/node_settings_default.mako b/website/templates/project/addon/node_settings_default.mako
index 342e98026b3..18183a00387 100644
--- a/website/templates/project/addon/node_settings_default.mako
+++ b/website/templates/project/addon/node_settings_default.mako
@@ -25,7 +25,7 @@
                 </p>
             </span>
 
-            <!-- Oauth Start Button -->
+            <!-- OAuth Start Button -->
             <span data-bind="if: showTokenCreateButton">
                 <a data-bind="click: connectAccount" class="text-primary pull-right addon-auth">
                   Connect Account
diff --git a/website/templates/project/modal_add_contributor.mako b/website/templates/project/modal_add_contributor.mako
index 9d7939dd19e..bebf8d05735 100644
--- a/website/templates/project/modal_add_contributor.mako
+++ b/website/templates/project/modal_add_contributor.mako
@@ -109,7 +109,7 @@
                                                     </a>
                                                 </span>
                                                 <span data-bind="visible: contributor.social.github">
-                                                    <a data-bind="attr: {href: contributor.social.github}" data-toggle="tooltip" title="Github" target="_blank">
+                                                    <a data-bind="attr: {href: contributor.social.github}" data-toggle="tooltip" title="GitHub" target="_blank">
                                                         <i class="fa fa-github-alt social-icons fa-lg"></i>
                                                     </a>
                                                 </span>
diff --git a/website/templates/project/project_header.mako b/website/templates/project/project_header.mako
index 8aa26140ee4..a50b273f7c6 100644
--- a/website/templates/project/project_header.mako
+++ b/website/templates/project/project_header.mako
@@ -195,7 +195,7 @@
     % endif
 
     % if node['anonymous'] and user['is_contributor_or_group_member']:
-        <div class="alert alert-info">This ${node['node_type']} is being viewed through an anonymized, view-only link. If you want to view it as a contributor, click <a class="link-solid" href="${node['redirect_url']}">here</a>.</div>
+        <div class="alert alert-info">This ${node['node_type']} is being viewed through an anonymized, view-only link. You can <a class="link-solid" href="${node['redirect_url']}">view it as a contributor</a>.</div>
     % endif
 
     % if node['link'] and not node['is_public'] and not user['is_contributor_or_group_member']:
diff --git a/website/templates/project/settings.mako b/website/templates/project/settings.mako
index fd922fa15c6..5b394036c2b 100644
--- a/website/templates/project/settings.mako
+++ b/website/templates/project/settings.mako
@@ -385,7 +385,7 @@
 
                                 <div class="help-block">
                                   Withdrawing children components of a registration is not allowed. Should you wish to
-                                  withdraw this component, please withdraw its parent registration <a href="${web_url_for('node_setting', pid=node['root_id'])}">here</a>.
+                                  withdraw this component, please <a href="${web_url_for('node_setting', pid=node['root_id'])}">withdraw its parent registration</a>.
                                 </div>
 
                             % else:
diff --git a/website/templates/public/register.mako b/website/templates/public/register.mako
index 290c991a425..dd1479fd82d 100644
--- a/website/templates/public/register.mako
+++ b/website/templates/public/register.mako
@@ -7,28 +7,28 @@
     %if campaign == "prereg":
         <div class="text-center m-t-lg">
             <h3>OSF Preregistration</h3><hr>
-            <p>Please login to the Open Science Framework or create a free account to continue.</p>
+            <p>Please log in to the Open Science Framework or create a free account to continue.</p>
         </div>
     %endif
 
     %if campaign == "erpc":
         <div class="text-center m-t-lg">
             <h3>Election Research Preacceptance Competition</h3><hr>
-            <p>Please login to the Open Science Framework or create a free account to continue.</p>
+            <p>Please log in to the Open Science Framework or create a free account to continue.</p>
         </div>
     %endif
 
     %if campaign == "osf-registries":
         <div class="text-center m-t-lg">
             <h3>OSF Registries</h3><hr>
-            <p>Please login to the Open Science Framework or create a free account to continue.</p>
+            <p>Please log in to the Open Science Framework or create a free account to continue.</p>
         </div>
     %endif
 
     %if campaign == "osf-preprints":
         <div class="text-center m-t-lg">
             <h3>OSF Preprints</h3><hr>
-            <p>Please login to the Open Science Framework or create a free account to contribute to OSF Preprints.</p>
+            <p>Please log in to the Open Science Framework or create a free account to contribute to OSF Preprints.</p>
         </div>
     %endif
 
diff --git a/website/templates/search.mako b/website/templates/search.mako
index bad65e38d81..7961e5a80ee 100644
--- a/website/templates/search.mako
+++ b/website/templates/search.mako
@@ -162,7 +162,7 @@
                     </li>
                     <li data-bind="visible: social.github">
                         <a data-bind="attr: {href: social.github}">
-                            <i class="fa fa-github-alt social-icons" data-toggle="tooltip" title="Github"></i>
+                            <i class="fa fa-github-alt social-icons" data-toggle="tooltip" title="GitHub"></i>
                         </a>
                     </li>
                     <li data-bind="visible: social.linkedIn">
diff --git a/website/util/metrics.py b/website/util/metrics.py
index c76adb89f5a..366381a4316 100644
--- a/website/util/metrics.py
+++ b/website/util/metrics.py
@@ -28,8 +28,8 @@ def campaign_source_tag(campaign_name):
     return f'source:campaign|{campaign_name}'
 
 
-def unregistered_created_source_tag(reffer_id):
-    return f'source:unregistered_created|{reffer_id}'
+def unregistered_created_source_tag(referrer_id):
+    return f'source:unregistered_created|{referrer_id}'
 
 
 def institution_source_tag(institution_id):
diff --git a/website/util/rubeus.py b/website/util/rubeus.py
index 0efbf1ac656..56a5d2a6761 100644
--- a/website/util/rubeus.py
+++ b/website/util/rubeus.py
@@ -56,10 +56,10 @@ def build_addon_root(node_settings, name, permissions=None,
 
     :param addonNodeSettingsBase node_settings: Addon settings
     :param String name: Additional information for the folder title
-        eg. Repo name for Github or bucket name for S3
+        eg. Repo name for GitHub or bucket name for S3
     :param dict or Auth permissions: Dictionary of permissions for the addon's content or Auth for use in node.can_X methods
     :param dict urls: Hgrid related urls
-    :param String extra: Html to be appened to the addon folder name
+    :param String extra: Html to be appended to the addon folder name
         eg. Branch switcher for github/bitbucket/gitlab
     :param list of dicts buttons: List of buttons to appear in HGrid row. Each
         dict must have 'text', a string that will appear on the button, and
@@ -125,7 +125,7 @@ def build_addon_root(node_settings, name, permissions=None,
 
 
 def build_addon_button(text, action, title=''):
-    """Builds am action button to be rendered in HGrid
+    """Builds an action button to be rendered in HGrid
 
     :param str text: A string or html to appear on the button itself
     :param str action: The name of the HGrid action for the button to call.
diff --git a/website/views.py b/website/views.py
index a0b3daeec3a..112e78f8f88 100644
--- a/website/views.py
+++ b/website/views.py
@@ -254,7 +254,7 @@ def resolve_guid(guid, suffix=None):
     Preprints for example are served from the external emberapp and streamed into Django and on to the user, while Wikis
     are served via a `/v1` endpoint, the `deep_url` for that resource.
 
-    There are also additional routes in this fintion that lead to legacies views that serve bytes for that files guid,
+    There are also additional routes in this function that lead to legacies views that serve bytes for that files guid,
     for example the url `/<file-guid>/?action=download` a response for file data is served.
     '''
 
diff --git a/yarn.lock b/yarn.lock
index 7dcf3023814..70f26dd5a2f 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -34,6 +34,35 @@
   resolved "https://registry.yarnpkg.com/@centerforopenscience/osf-style/-/osf-style-1.9.0.tgz#0ab5cb17e2c531aafcc19e226f36ff86b734116e"
   integrity sha512-R9IBVbz4eb/NkoM5TZGH46T9m5jspwK0H605O0oSMggHZPcTrf5gAHw0axeC26nKmEpz2FSXjvm84ziPNvhsvA==
 
+"@fortawesome/fontawesome-common-types@7.0.1":
+  version "7.0.1"
+  resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-7.0.1.tgz#e9ab94b1ca93e7020e3c7eda2ef1ba8cca8ba1dc"
+  integrity sha512-0VpNtO5cNe1/HQWMkl4OdncYK/mv9hnBte0Ew0n6DMzmo3Q3WzDFABHm6LeNTipt5zAyhQ6Ugjiu8aLaEjh1gg==
+
+"@fortawesome/fontawesome-free@^7.0.1":
+  version "7.0.1"
+  resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-free/-/fontawesome-free-7.0.1.tgz#c1ac7f07ba2df47d1de7b7236fad25c4e6ca5076"
+  integrity sha512-RLmb9U6H2rJDnGxEqXxzy7ANPrQz7WK2/eTjdZqyU9uRU5W+FkAec9uU5gTYzFBH7aoXIw2WTJSCJR4KPlReQw==
+
+"@fortawesome/fontawesome-svg-core@^7.0.1":
+  version "7.0.1"
+  resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-svg-core/-/fontawesome-svg-core-7.0.1.tgz#f5f7bbfe09e7cc35fd30eefe6be018d2e9c5dd4d"
+  integrity sha512-x0cR55ILVqFpUioSMf6ebpRCMXMcheGN743P05W2RB5uCNpJUqWIqW66Lap8PfL/lngvjTbZj0BNSUweIr/fHQ==
+  dependencies:
+    "@fortawesome/fontawesome-common-types" "7.0.1"
+
+"@fortawesome/free-brands-svg-icons@^7.0.1":
+  version "7.0.1"
+  resolved "https://registry.yarnpkg.com/@fortawesome/free-brands-svg-icons/-/free-brands-svg-icons-7.0.1.tgz#2a975ae2a26710cb2b34c25d4fe706dcd4747f69"
+  integrity sha512-6xPmn5SrND/GM0+W33E77x05+aDn6RpR02eWd8eLdN0IxY0vXa5yU/ugaAKloOVxiG9w2330TSRsbJYL6c57Ow==
+  dependencies:
+    "@fortawesome/fontawesome-common-types" "7.0.1"
+
+"@fortawesome/react-fontawesome@^3.0.2":
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/@fortawesome/react-fontawesome/-/react-fontawesome-3.0.2.tgz#275ab6bc04977e145b072ba18c24779eb3427073"
+  integrity sha512-cmp/nT0pPC7HUALF8uc3+D5ECwEBWxYQbOIHwtGUWEu72sWtZc26k5onr920HWOViF0nYaC+Qzz6Ln56SQcaVg==
+
 "@samverschueren/stream-to-observable@^0.3.0":
   version "0.3.1"
   resolved "https://registry.yarnpkg.com/@samverschueren/stream-to-observable/-/stream-to-observable-0.3.1.tgz#a21117b19ee9be70c379ec1877537ef2e1c63301"
@@ -1580,11 +1609,6 @@ font-awesome-webpack@0.0.5-beta.2:
     less-loader "~2.2.3"
     style-loader "~0.13.1"
 
-font-awesome@^4.4.0:
-  version "4.7.0"
-  resolved "https://registry.yarnpkg.com/font-awesome/-/font-awesome-4.7.0.tgz#8fa8cf0411a1a31afd07b06d2902bb9fc815a133"
-  integrity sha1-j6jPBBGhoxr9B7BtKQK7n8gVoTM=
-
 from2@^2.1.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/from2/-/from2-2.3.0.tgz#8bfb5502bde4a4d36cfdeea007fcca21d7e382af"