diff --git a/.dockerignore b/.dockerignore
index e8f6e66311c7..1665783ba48e 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -89,7 +89,6 @@ test_root/paver_logs/
 test_root/uploads/
 **/django-pyfs
 **/.tox/
-common/test/db_cache/bok_choy_*.yaml
 common/test/data/badges/*.png
 
 ### Installation artifacts
diff --git a/.github/actions/unit-tests/action.yml b/.github/actions/unit-tests/action.yml
index 404ab2cf5711..2a5429baff09 100644
--- a/.github/actions/unit-tests/action.yml
+++ b/.github/actions/unit-tests/action.yml
@@ -27,7 +27,7 @@ runs:
 
     - name: save pytest warnings json file
       if: success()
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v3
       with:
         name: pytest-warnings-json
         path: |
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
index beb80bd640ab..bc8c2bbab21c 100644
--- a/.github/pull_request_template.md
+++ b/.github/pull_request_template.md
@@ -1,10 +1,13 @@
 <!--
 
-🌴🌴
-🌴🌴🌴🌴         🌴 Note: Palm is in support. Fixes you make on master may still be needed on Palm.
-    🌴🌴🌴🌴     If so, make another pull request against the open-release/palm.master branch,
-🌴🌴🌴🌴         or ask in the #wg-build-test-release Slack channel if you have any questions or need help.
-🌴🌴
+🌳🌳
+🌳🌳🌳🌳         🌳 Note: Quince is in support. Fixes you make on master may still be needed on Quince.
+    🌳🌳🌳🌳     If so, make another pull request against the open-release/quince.master branch,
+🌳🌳🌳🌳         or ask in the #wg-build-test-release Slack channel if you have any questions or need help.
+🌳🌳
+
+🌴🌴🌴🌴🌴🌴     🌴 Note: the Palm release is still supported.
+                Please consider whether your change should be applied to Palm as well.
 
 Please give your pull request a short but descriptive title.
 Use conventional commits to separate and summarize commits logically:
diff --git a/.github/workflows/js-tests.yml b/.github/workflows/js-tests.yml
index 6a0a80ff6618..d28f6da24ff9 100644
--- a/.github/workflows/js-tests.yml
+++ b/.github/workflows/js-tests.yml
@@ -23,7 +23,7 @@ jobs:
       run: git fetch --depth=1 origin master
 
     - name: Setup Node
-      uses: actions/setup-node@v2
+      uses: actions/setup-node@v3
       with:
         node-version: ${{ matrix.node-version }}
 
diff --git a/.github/workflows/publish-ci-docker-image.yml b/.github/workflows/publish-ci-docker-image.yml
index 997c050b73cd..fd1c2da1d4c0 100644
--- a/.github/workflows/publish-ci-docker-image.yml
+++ b/.github/workflows/publish-ci-docker-image.yml
@@ -13,8 +13,17 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v2
 
+      # This has to happen after checkout in order for gh to work.
+      - name: "Cancel scheduled job on forks"
+        if: github.repository != 'openedx/edx-platform' && github.event_name == 'schedule'
+        env:
+          GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
+        run: |
+          gh run cancel "${{ github.run_id }}"
+          gh run watch "${{ github.run_id }}"
+
       - name: Configure AWS Credentials
-        uses: aws-actions/configure-aws-credentials@v3
+        uses: aws-actions/configure-aws-credentials@v4
         with:
           aws-access-key-id: ${{ secrets.TOOLS_EDX_ECR_USER_AWS_ACCESS_KEY_ID }}
           aws-secret-access-key: ${{ secrets.TOOLS_EDX_ECR_USER_AWS_SECRET_ACCESS_KEY }}
diff --git a/.github/workflows/quality-checks.yml b/.github/workflows/quality-checks.yml
index 2a4a8d2ceb19..0097feb4cd37 100644
--- a/.github/workflows/quality-checks.yml
+++ b/.github/workflows/quality-checks.yml
@@ -35,7 +35,7 @@ jobs:
         python-version: ${{ matrix.python-version }}
 
     - name: Setup Node
-      uses: actions/setup-node@v2
+      uses: actions/setup-node@v3
       with:
         node-version: ${{ matrix.node-version }}
 
diff --git a/.github/workflows/static-assets-check.yml b/.github/workflows/static-assets-check.yml
index c4da37f2d1fe..271b6ada81ee 100644
--- a/.github/workflows/static-assets-check.yml
+++ b/.github/workflows/static-assets-check.yml
@@ -32,7 +32,7 @@ jobs:
         sudo apt-get install libxmlsec1-dev pkg-config
 
     - name: Setup Node
-      uses: actions/setup-node@v2
+      uses: actions/setup-node@v3
       with:
         node-version: ${{ matrix.node-version }}
 
@@ -64,8 +64,8 @@ jobs:
 
     - name: Run Static Assets Check
       env:
-        LMS_CFG: lms/envs/bok_choy.yml
-        CMS_CFG: cms/envs/bok_choy.yml
+        LMS_CFG: lms/envs/minimal.yml
+        CMS_CFG: lms/envs/minimal.yml
 
       run: |
         paver update_assets lms
diff --git a/.github/workflows/unit-test-shards.json b/.github/workflows/unit-test-shards.json
index 50e54ea22402..4c95f2510fa1 100644
--- a/.github/workflows/unit-test-shards.json
+++ b/.github/workflows/unit-test-shards.json
@@ -2,7 +2,6 @@
   "lms-1": {
     "settings": "lms.envs.test",
     "paths": [
-      "lms/djangoapps/badges/",
       "lms/djangoapps/branding/",
       "lms/djangoapps/bulk_email/",
       "lms/djangoapps/bulk_enroll/",
@@ -78,7 +77,7 @@
       "lms/tests.py"
     ]
   },
-  "openedx-1": {
+  "openedx-1-with-lms": {
     "settings": "lms.envs.test",
     "paths": [
       "openedx/core/djangoapps/ace_common/",
@@ -116,7 +115,7 @@
       "openedx/core/djangoapps/external_user_ids/"
     ]
   },
-  "openedx-2": {
+  "openedx-2-with-lms": {
     "settings": "lms.envs.test",
     "paths": [
       "openedx/core/djangoapps/geoinfo/",
@@ -159,7 +158,7 @@
       "openedx/tests/"
     ]
   },
-  "openedx-3": {
+  "openedx-1-with-cms": {
     "settings": "cms.envs.test",
     "paths": [
       "openedx/core/djangoapps/ace_common/",
@@ -197,7 +196,7 @@
       "openedx/core/djangoapps/external_user_ids/"
     ]
   },
-  "openedx-4": {
+  "openedx-2-with-cms": {
     "settings": "cms.envs.test",
     "paths": [
       "openedx/core/djangoapps/content_tagging/",
@@ -258,22 +257,28 @@
       "cms/djangoapps/contentstore/"
     ]
   },
-  "common-1": {
+  "common-with-lms": {
     "settings": "lms.envs.test",
     "paths": [
       "common/djangoapps/"
     ]
   },
-  "common-2": {
+  "common-with-cms": {
     "settings": "cms.envs.test",
     "paths": [
       "common/djangoapps/"
     ]
   },
-  "xmodule-1": {
+  "xmodule-with-lms": {
     "settings": "lms.envs.test",
     "paths": [
       "xmodule/"
     ]
+  },
+  "xmodule-with-cms": {
+    "settings": "cms.envs.test",
+    "paths": [
+      "xmodule/"
+    ]
   }
 }
diff --git a/.github/workflows/unit-tests-gh-hosted.yml b/.github/workflows/unit-tests-gh-hosted.yml
index 5062df625c3a..60dabbbecec8 100644
--- a/.github/workflows/unit-tests-gh-hosted.yml
+++ b/.github/workflows/unit-tests-gh-hosted.yml
@@ -26,15 +26,16 @@ jobs:
           - "lms-4"
           - "lms-5"
           - "lms-6"
-          - "openedx-1"
-          - "openedx-2"
-          - "openedx-3"
-          - "openedx-4"
+          - "openedx-1-with-lms"
+          - "openedx-2-with-lms"
+          - "openedx-1-with-cms"
+          - "openedx-2-with-cms"
           - "cms-1"
           - "cms-2"
-          - "common-1"
-          - "common-2"
-          - "xmodule-1"
+          - "common-with-lms"
+          - "common-with-cms"
+          - "xmodule-with-lms"
+          - "xmodule-with-cms"
     name: gh-hosted-python-${{ matrix.python-version }},django-${{ matrix.django-version }},${{ matrix.shard_name }}
     steps:
       - uses: actions/checkout@v2
diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml
index 44d88262afd9..c3b1086c20eb 100644
--- a/.github/workflows/unit-tests.yml
+++ b/.github/workflows/unit-tests.yml
@@ -27,15 +27,16 @@ jobs:
           - "lms-4"
           - "lms-5"
           - "lms-6"
-          - "openedx-1"
-          - "openedx-2"
-          - "openedx-3"
-          - "openedx-4"
+          - "openedx-1-with-lms"
+          - "openedx-2-with-lms"
+          - "openedx-1-with-cms"
+          - "openedx-2-with-cms"
           - "cms-1"
           - "cms-2"
-          - "common-1"
-          - "common-2"
-          - "xmodule-1"
+          - "common-with-lms"
+          - "common-with-cms"
+          - "xmodule-with-lms"
+          - "xmodule-with-cms"
     # We expect Django 4.0 to fail, so don't stop when it fails.
     continue-on-error: ${{ matrix.django-version == '4.0' }}
 
@@ -101,7 +102,7 @@ jobs:
         run: sudo chown runner:runner -R .*
       - uses: actions/checkout@v3
       - name: collect pytest warnings files
-        uses: actions/download-artifact@v2
+        uses: actions/download-artifact@v3
         with:
           name: pytest-warnings-json
           path: test_root/log
diff --git a/.gitignore b/.gitignore
index 1866979edc93..169296690009 100644
--- a/.gitignore
+++ b/.gitignore
@@ -86,7 +86,6 @@ test_root/paver_logs/
 test_root/uploads/
 django-pyfs
 .tox/
-common/test/db_cache/bok_choy_*.yaml
 common/test/data/badges/*.png
 
 ### Installation artifacts
diff --git a/Dockerfile b/Dockerfile
index b9da9d6eb4a4..a159d32464d3 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -153,10 +153,11 @@ FROM base as production
 USER app
 
 ENV EDX_PLATFORM_SETTINGS='docker-production'
-ENV SERVICE_VARIANT "${SERVICE_VARIANT}"
-ENV SERVICE_PORT "${SERVICE_PORT}"
+ENV SERVICE_VARIANT="${SERVICE_VARIANT}"
+ENV SERVICE_PORT="${SERVICE_PORT}"
 ENV DJANGO_SETTINGS_MODULE="${SERVICE_VARIANT}.envs.$EDX_PLATFORM_SETTINGS"
 EXPOSE ${SERVICE_PORT}
+
 CMD gunicorn \
     -c /edx/app/edxapp/edx-platform/${SERVICE_VARIANT}/docker_${SERVICE_VARIANT}_gunicorn.py \
     --name ${SERVICE_VARIANT} \
@@ -187,6 +188,6 @@ RUN ln -s "$(pwd)/cms/envs/devstack-experimental.yml" "/edx/etc/studio.yml"
 RUN touch ../edxapp_env
 
 ENV EDX_PLATFORM_SETTINGS='devstack_docker'
-ENV SERVICE_VARIANT "${SERVICE_VARIANT}"
+ENV SERVICE_VARIANT="${SERVICE_VARIANT}"
 EXPOSE ${SERVICE_PORT}
 CMD ./manage.py ${SERVICE_VARIANT} runserver 0.0.0.0:${SERVICE_PORT}
diff --git a/README.rst b/README.rst
index d8d3a880c54b..0a49b634fc50 100644
--- a/README.rst
+++ b/README.rst
@@ -134,7 +134,7 @@ Reporting Security Issues
 *************************
 
 Please do not report security issues in public. Please email
-security@edx.org.
+security@openedx.org.
 
 .. _individual contributor agreement: https://openedx.org/cla
 .. _CONTRIBUTING: https://github.com/openedx/.github/blob/master/CONTRIBUTING.md
diff --git a/b b/b
new file mode 100644
index 000000000000..6e3be0f4ffe1
--- /dev/null
+++ b/b
@@ -0,0 +1 @@
+ttttests
diff --git a/cms/djangoapps/contentstore/asset_storage_handlers.py b/cms/djangoapps/contentstore/asset_storage_handlers.py
index 8808dc4f0b53..82aef8d5ec76 100644
--- a/cms/djangoapps/contentstore/asset_storage_handlers.py
+++ b/cms/djangoapps/contentstore/asset_storage_handlers.py
@@ -43,6 +43,7 @@
     'direction': '',
     'asset_type': '',
     'text_search': '',
+    'display_name': '',
 }
 
 
@@ -61,7 +62,9 @@ def handle_assets(request, course_key_string=None, asset_key_string=None):
             sort: the asset field to sort by (defaults to 'date_added')
             direction: the sort direction (defaults to 'descending')
             asset_type: the file type to filter items to (defaults to All)
-            text_search: string to filter results by file name (defaults to '')
+            text_search: string to perform a search on filenames (defaults to '')
+            display_name: string to filter results by exact display name (defaults to '').
+                Use the display_name parameter multiple times to filter by multiple filenames.
     POST
         json: create or update an asset. The only updating that can be done is changing the lock state.
     PUT
@@ -172,6 +175,9 @@ def _assets_json(request, course_key):
 
         filter_parameters.update(_get_content_type_filter_for_mongo(request_options['requested_asset_type']))
 
+    if request_options['requested_display_names']:
+        filter_parameters.update(_get_displayname_filter_for_mongo(request_options['requested_display_names']))
+
     if request_options['requested_text_search']:
         filter_parameters.update(_get_displayname_search_filter_for_mongo(request_options['requested_text_search']))
 
@@ -223,6 +229,7 @@ def _parse_request_to_dictionary(request):
         'requested_sort_direction': _get_requested_attribute(request, 'direction'),
         'requested_asset_type': _get_requested_attribute(request, 'asset_type'),
         'requested_text_search': _get_requested_attribute(request, 'text_search'),
+        'requested_display_names': _get_requested_attribute_list(request, 'display_name'),
     }
 
 
@@ -230,6 +237,10 @@ def _get_requested_attribute(request, attribute):
     return request.GET.get(attribute, REQUEST_DEFAULTS.get(attribute))
 
 
+def _get_requested_attribute_list(request, attribute):
+    return request.GET.getlist(attribute, REQUEST_DEFAULTS.get(attribute))
+
+
 def _get_error_if_invalid_parameters(requested_filter):
     """Function for returning error messages on filters"""
     requested_file_types = _get_requested_file_types_from_requested_filter(requested_filter)
@@ -303,6 +314,24 @@ def _get_mongo_expression_for_type_filter(requested_file_types):
     }
 
 
+def _get_displayname_filter_for_mongo(displaynames):
+    """
+    Construct and return pymongo query dict, filtering for the given list of displaynames.
+    """
+    filters = []
+
+    for displayname in displaynames:
+        filters.append({
+            'displayname': {
+                '$eq': displayname,
+            },
+        })
+
+    return {
+        '$or': filters,
+    }
+
+
 def _get_displayname_search_filter_for_mongo(text_search):
     """
     Return a pymongo query dict for the given search string, using case insensitivity.
diff --git a/cms/djangoapps/contentstore/exams.py b/cms/djangoapps/contentstore/exams.py
index 2dfa72e2d067..f8a88b45dda3 100644
--- a/cms/djangoapps/contentstore/exams.py
+++ b/cms/djangoapps/contentstore/exams.py
@@ -109,7 +109,7 @@ def get_exam_type(is_proctored, is_practice, is_onboarding):
         if is_onboarding:
             exam_type = 'onboarding'
         elif is_practice:
-            exam_type = 'practice_proctored'
+            exam_type = 'practice'
         else:
             exam_type = 'proctored'
     else:
diff --git a/cms/djangoapps/contentstore/management/commands/replace_v1_lib_refs_with_v2_in_courses.py b/cms/djangoapps/contentstore/management/commands/replace_v1_lib_refs_with_v2_in_courses.py
index 727f340abf7b..6c19a89cf3ff 100644
--- a/cms/djangoapps/contentstore/management/commands/replace_v1_lib_refs_with_v2_in_courses.py
+++ b/cms/djangoapps/contentstore/management/commands/replace_v1_lib_refs_with_v2_in_courses.py
@@ -34,7 +34,11 @@ def add_arguments(self, parser):
     def replace_all_library_source_blocks_ids(self, v1_to_v2_lib_map):
         """A method to replace 'source_library_id' in all relevant blocks."""
 
-        course_id_strings = CourseOverview.get_all_course_keys()
+        course_id_strings = list(CourseOverview.get_all_course_keys())
+
+        # Following is used for debugging and should be removed
+        for course_id_string in course_id_strings:
+            log.info(course_id_string)
 
         # Use Celery to distribute the workload
         tasks = group(
@@ -57,7 +61,7 @@ def replace_all_library_source_blocks_ids(self, v1_to_v2_lib_map):
 
     def validate(self, v1_to_v2_lib_map):
         """ Validate that replace_all_library_source_blocks_ids was successful"""
-        course_id_strings = CourseOverview.get_all_course_keys()
+        course_id_strings = list(CourseOverview.get_all_course_keys())
         tasks = group(validate_all_library_source_blocks_ids_for_course.s(course_id, v1_to_v2_lib_map) for course_id in course_id_strings)  # lint-amnesty, pylint: disable=line-too-long
         results = tasks.apply_async()
 
@@ -79,7 +83,7 @@ def validate(self, v1_to_v2_lib_map):
 
     def undo(self, v1_to_v2_lib_map):
         """ undo the changes made by replace_all_library_source_blocks_ids"""
-        course_id_strings = CourseOverview.get_all_course_keys()
+        course_id_strings = list(CourseOverview.get_all_course_keys())
 
         # Use Celery to distribute the workload
         tasks = group(
diff --git a/cms/djangoapps/contentstore/rest_api/serializers/__init__.py b/cms/djangoapps/contentstore/rest_api/serializers/__init__.py
new file mode 100644
index 000000000000..9d207ee767ea
--- /dev/null
+++ b/cms/djangoapps/contentstore/rest_api/serializers/__init__.py
@@ -0,0 +1,4 @@
+"""
+Serializers for all contentstore API versions
+"""
+from .common import StrictSerializer
diff --git a/cms/djangoapps/contentstore/rest_api/v1/serializers/common.py b/cms/djangoapps/contentstore/rest_api/serializers/common.py
similarity index 100%
rename from cms/djangoapps/contentstore/rest_api/v1/serializers/common.py
rename to cms/djangoapps/contentstore/rest_api/serializers/common.py
diff --git a/cms/djangoapps/contentstore/rest_api/v0/__init__.py b/cms/djangoapps/contentstore/rest_api/v0/__init__.py
index e69de29bb2d1..4ceefe6ead69 100644
--- a/cms/djangoapps/contentstore/rest_api/v0/__init__.py
+++ b/cms/djangoapps/contentstore/rest_api/v0/__init__.py
@@ -0,0 +1,12 @@
+"""
+Views for v0 contentstore API.
+"""
+
+from cms.djangoapps.contentstore.rest_api.v0.views.assets import (
+    AssetsCreateRetrieveView,
+    AssetsUpdateDestroyView
+)
+from cms.djangoapps.contentstore.rest_api.v0.views.xblock import (
+    XblockView,
+    XblockCreateView
+)
diff --git a/cms/djangoapps/contentstore/rest_api/v0/serializers/__init__.py b/cms/djangoapps/contentstore/rest_api/v0/serializers/__init__.py
index 0e799ab1cc21..4ca1f5f05a24 100644
--- a/cms/djangoapps/contentstore/rest_api/v0/serializers/__init__.py
+++ b/cms/djangoapps/contentstore/rest_api/v0/serializers/__init__.py
@@ -2,4 +2,7 @@
 Serializers for v0 contentstore API.
 """
 from .advanced_settings import AdvancedSettingsFieldSerializer, CourseAdvancedSettingsSerializer
+from .assets import AssetSerializer
 from .tabs import CourseTabSerializer, CourseTabUpdateSerializer, TabIDLocatorSerializer
+from .transcripts import TranscriptSerializer
+from .xblock import XblockSerializer
diff --git a/cms/djangoapps/contentstore/rest_api/v1/serializers/assets.py b/cms/djangoapps/contentstore/rest_api/v0/serializers/assets.py
similarity index 78%
rename from cms/djangoapps/contentstore/rest_api/v1/serializers/assets.py
rename to cms/djangoapps/contentstore/rest_api/v0/serializers/assets.py
index e44c31b511ed..7ecb473d1ade 100644
--- a/cms/djangoapps/contentstore/rest_api/v1/serializers/assets.py
+++ b/cms/djangoapps/contentstore/rest_api/v0/serializers/assets.py
@@ -2,7 +2,7 @@
 API Serializers for assets
 """
 from rest_framework import serializers
-from .common import StrictSerializer
+from cms.djangoapps.contentstore.rest_api.serializers.common import StrictSerializer
 
 
 class AssetSerializer(StrictSerializer):
diff --git a/cms/djangoapps/contentstore/rest_api/v1/serializers/transcripts.py b/cms/djangoapps/contentstore/rest_api/v0/serializers/transcripts.py
similarity index 83%
rename from cms/djangoapps/contentstore/rest_api/v1/serializers/transcripts.py
rename to cms/djangoapps/contentstore/rest_api/v0/serializers/transcripts.py
index 2b72f1ff441e..bf6ea1d9f382 100644
--- a/cms/djangoapps/contentstore/rest_api/v1/serializers/transcripts.py
+++ b/cms/djangoapps/contentstore/rest_api/v0/serializers/transcripts.py
@@ -2,7 +2,7 @@
 API Serializers for transcripts
 """
 from rest_framework import serializers
-from .common import StrictSerializer
+from cms.djangoapps.contentstore.rest_api.serializers.common import StrictSerializer
 
 
 class TranscriptSerializer(StrictSerializer):
diff --git a/cms/djangoapps/contentstore/rest_api/v1/serializers/xblock.py b/cms/djangoapps/contentstore/rest_api/v0/serializers/xblock.py
similarity index 98%
rename from cms/djangoapps/contentstore/rest_api/v1/serializers/xblock.py
rename to cms/djangoapps/contentstore/rest_api/v0/serializers/xblock.py
index 522a34e0777d..4549326c9696 100644
--- a/cms/djangoapps/contentstore/rest_api/v1/serializers/xblock.py
+++ b/cms/djangoapps/contentstore/rest_api/v0/serializers/xblock.py
@@ -2,7 +2,7 @@
 API Serializers for xblocks
 """
 from rest_framework import serializers
-from .common import StrictSerializer
+from cms.djangoapps.contentstore.rest_api.serializers.common import StrictSerializer
 
 # The XblockSerializer is designed to be scalable and generic. As such, its structure
 # should remain as general as possible. Avoid indiscriminately adding fields to it,
diff --git a/cms/djangoapps/contentstore/rest_api/v1/views/tests/test_assets.py b/cms/djangoapps/contentstore/rest_api/v0/tests/test_assets.py
similarity index 95%
rename from cms/djangoapps/contentstore/rest_api/v1/views/tests/test_assets.py
rename to cms/djangoapps/contentstore/rest_api/v0/tests/test_assets.py
index 0561a781c656..38429910edd1 100644
--- a/cms/djangoapps/contentstore/rest_api/v1/views/tests/test_assets.py
+++ b/cms/djangoapps/contentstore/rest_api/v0/tests/test_assets.py
@@ -21,6 +21,7 @@
 ASSET_KEY_STRING = "asset-v1:dede+aba+weagi+type@asset+block@_0e37192a-42c4-441e-a3e1-8e40ec304e2e.jpg"
 mock_image = MagicMock(file=File)
 mock_image.name = "test.jpg"
+VERSION = "v0"
 
 
 class AssetsViewTestCase(AuthorizeStaffTestCase):
@@ -44,7 +45,7 @@ def get_url_params(self):
 
     def get_url(self, _course_id=None):
         return reverse(
-            "cms.djangoapps.contentstore:v1:cms_api_update_destroy_assets",
+            f"cms.djangoapps.contentstore:{VERSION}:cms_api_update_destroy_assets",
             kwargs=self.get_url_params(),
         )
 
@@ -52,7 +53,7 @@ def send_request(self, _url, _data):
         raise NotImplementedError("send_request must be implemented by subclasses")
 
     @patch(
-        "cms.djangoapps.contentstore.rest_api.v1.views.assets.handle_assets",
+        f"cms.djangoapps.contentstore.rest_api.{VERSION}.views.assets.handle_assets",
         return_value=JsonResponse(
             {
                 "locator": ASSET_KEY_STRING,
@@ -61,7 +62,7 @@ def send_request(self, _url, _data):
         ),
     )
     @patch(
-        "cms.djangoapps.contentstore.rest_api.v1.views.xblock.toggles.use_studio_content_api",
+        f"cms.djangoapps.contentstore.rest_api.{VERSION}.views.xblock.toggles.use_studio_content_api",
         return_value=True,
     )
     def make_request(
@@ -104,7 +105,7 @@ def get_url_params(self):
 
     def get_url(self, _course_id=None):
         return reverse(
-            "cms.djangoapps.contentstore:v1:cms_api_create_retrieve_assets",
+            f"cms.djangoapps.contentstore:{VERSION}:cms_api_create_retrieve_assets",
             kwargs=self.get_url_params(),
         )
 
@@ -156,7 +157,7 @@ def get_url_params(self):
 
     def get_url(self, _course_id=None):
         return reverse(
-            "cms.djangoapps.contentstore:v1:cms_api_create_retrieve_assets",
+            f"cms.djangoapps.contentstore:{VERSION}:cms_api_create_retrieve_assets",
             kwargs=self.get_url_params(),
         )
 
diff --git a/cms/djangoapps/contentstore/rest_api/v1/views/tests/test_xblock.py b/cms/djangoapps/contentstore/rest_api/v0/tests/test_xblock.py
similarity index 96%
rename from cms/djangoapps/contentstore/rest_api/v1/views/tests/test_xblock.py
rename to cms/djangoapps/contentstore/rest_api/v0/tests/test_xblock.py
index fe214c2f8113..e4c21eb353b1 100644
--- a/cms/djangoapps/contentstore/rest_api/v1/views/tests/test_xblock.py
+++ b/cms/djangoapps/contentstore/rest_api/v0/tests/test_xblock.py
@@ -15,6 +15,7 @@
 
 
 TEST_LOCATOR = "block-v1:dede+aba+weagi+type@problem+block@ba6327f840da49289fb27a9243913478"
+VERSION = "v0"
 
 
 class XBlockViewTestCase(AuthorizeStaffTestCase):
@@ -38,7 +39,7 @@ def get_url_params(self):
 
     def get_url(self, _course_id=None):
         return reverse(
-            "cms.djangoapps.contentstore:v1:cms_api_xblock",
+            f"cms.djangoapps.contentstore:{VERSION}:cms_api_xblock",
             kwargs=self.get_url_params(),
         )
 
@@ -46,7 +47,7 @@ def send_request(self, _url, _data):
         raise NotImplementedError("send_request must be implemented by subclasses")
 
     @patch(
-        "cms.djangoapps.contentstore.rest_api.v1.views.xblock.handle_xblock",
+        f"cms.djangoapps.contentstore.rest_api.{VERSION}.views.xblock.handle_xblock",
         return_value=JsonResponse(
             {
                 "locator": TEST_LOCATOR,
@@ -55,7 +56,7 @@ def send_request(self, _url, _data):
         ),
     )
     @patch(
-        "cms.djangoapps.contentstore.rest_api.v1.views.xblock.toggles.use_studio_content_api",
+        f"cms.djangoapps.contentstore.rest_api.{VERSION}.views.xblock.toggles.use_studio_content_api",
         return_value=True,
     )
     def make_request(
@@ -134,13 +135,14 @@ class XBlockViewPostTest(XBlockViewTestCase, ModuleStoreTestCase, APITestCase):
     """
     Test POST operation on xblocks - Create a new xblock for a parent xblock
     """
+    VERSION = "v0"
 
     def get_url_params(self):
         return {"course_id": self.get_course_key_string()}
 
     def get_url(self, _course_id=None):
         return reverse(
-            "cms.djangoapps.contentstore:v1:cms_api_create_xblock",
+            f"cms.djangoapps.contentstore:{VERSION}:cms_api_create_xblock",
             kwargs=self.get_url_params(),
         )
 
diff --git a/cms/djangoapps/contentstore/rest_api/v0/urls.py b/cms/djangoapps/contentstore/rest_api/v0/urls.py
index eb435ef338d8..8c9a772c34fe 100644
--- a/cms/djangoapps/contentstore/rest_api/v0/urls.py
+++ b/cms/djangoapps/contentstore/rest_api/v0/urls.py
@@ -1,12 +1,20 @@
 """ Contenstore API v0 URLs. """
 
-from django.urls import re_path
+from django.conf import settings
+from django.urls import re_path, path
 
 from openedx.core.constants import COURSE_ID_PATTERN
+
 from .views import AdvancedCourseSettingsView, CourseTabSettingsView, CourseTabListView, CourseTabReorderView
+from .views import assets
+from .views import transcripts
+from .views import authoring_videos
+from .views import xblock
 
 app_name = "v0"
 
+VIDEO_ID_PATTERN = r'(?P<edx_video_id>[-\w]+)'
+
 urlpatterns = [
     re_path(
         fr"^advanced_settings/{COURSE_ID_PATTERN}$",
@@ -28,4 +36,46 @@
         CourseTabReorderView.as_view(),
         name="course_tab_reorder",
     ),
+
+    # Authoring API
+    re_path(
+        fr'^file_assets/{settings.COURSE_ID_PATTERN}/$',
+        assets.AssetsCreateRetrieveView.as_view(), name='cms_api_create_retrieve_assets'
+    ),
+    re_path(
+        fr'^file_assets/{settings.COURSE_ID_PATTERN}/{settings.ASSET_KEY_PATTERN}$',
+        assets.AssetsUpdateDestroyView.as_view(), name='cms_api_update_destroy_assets'
+    ),
+    re_path(
+        fr'^videos/encodings/{settings.COURSE_ID_PATTERN}$',
+        authoring_videos.VideoEncodingsDownloadView.as_view(), name='cms_api_videos_encodings'
+    ),
+    path(
+        'videos/features/',
+        authoring_videos.VideoFeaturesView.as_view(), name='cms_api_videos_features'
+    ),
+    re_path(
+        fr'^videos/images/{settings.COURSE_ID_PATTERN}/{VIDEO_ID_PATTERN}$',
+        authoring_videos.VideoImagesView.as_view(), name='cms_api_videos_images'
+    ),
+    re_path(
+        fr'^videos/uploads/{settings.COURSE_ID_PATTERN}/$',
+        authoring_videos.VideosCreateUploadView.as_view(), name='cms_api_create_videos_upload'
+    ),
+    re_path(
+        fr'^videos/uploads/{settings.COURSE_ID_PATTERN}/{VIDEO_ID_PATTERN}$',
+        authoring_videos.VideosUploadsView.as_view(), name='cms_api_videos_uploads'
+    ),
+    re_path(
+        fr'^video_transcripts/{settings.COURSE_ID_PATTERN}$',
+        transcripts.TranscriptView.as_view(), name='cms_api_video_transcripts'
+    ),
+    re_path(
+        fr'^xblock/{settings.COURSE_ID_PATTERN}/$',
+        xblock.XblockCreateView.as_view(), name='cms_api_create_xblock'
+    ),
+    re_path(
+        fr'^xblock/{settings.COURSE_ID_PATTERN}/{settings.USAGE_KEY_PATTERN}$',
+        xblock.XblockView.as_view(), name='cms_api_xblock'
+    ),
 ]
diff --git a/cms/djangoapps/contentstore/rest_api/v1/views/assets.py b/cms/djangoapps/contentstore/rest_api/v0/views/assets.py
similarity index 96%
rename from cms/djangoapps/contentstore/rest_api/v1/views/assets.py
rename to cms/djangoapps/contentstore/rest_api/v0/views/assets.py
index 1cc601dca9f6..0c0c24aeab69 100644
--- a/cms/djangoapps/contentstore/rest_api/v1/views/assets.py
+++ b/cms/djangoapps/contentstore/rest_api/v0/views/assets.py
@@ -9,12 +9,12 @@
 from openedx.core.lib.api.view_utils import DeveloperErrorViewMixin, view_auth_classes
 from common.djangoapps.util.json_request import expect_json_in_class_view
 
-from ....api import course_author_access_required
+from cms.djangoapps.contentstore.api import course_author_access_required
 
 from cms.djangoapps.contentstore.asset_storage_handlers import handle_assets
 import cms.djangoapps.contentstore.toggles as contentstore_toggles
 
-from cms.djangoapps.contentstore.rest_api.v1.serializers import AssetSerializer
+from ..serializers.assets import AssetSerializer
 from .utils import validate_request_with_serializer
 from rest_framework.parsers import (MultiPartParser, FormParser, JSONParser)
 from openedx.core.lib.api.parsers import TypedFileUploadParser
diff --git a/cms/djangoapps/contentstore/rest_api/v0/views/authoring_videos.py b/cms/djangoapps/contentstore/rest_api/v0/views/authoring_videos.py
new file mode 100644
index 000000000000..972b6229f55a
--- /dev/null
+++ b/cms/djangoapps/contentstore/rest_api/v0/views/authoring_videos.py
@@ -0,0 +1,167 @@
+"""
+Public rest API endpoints for the Authoring API video assets.
+"""
+import logging
+from rest_framework.generics import (
+    CreateAPIView,
+    RetrieveAPIView,
+    DestroyAPIView
+)
+from rest_framework.parsers import (MultiPartParser, FormParser)
+from django.views.decorators.csrf import csrf_exempt
+from django.http import Http404
+
+from openedx.core.lib.api.view_utils import DeveloperErrorViewMixin, view_auth_classes
+from openedx.core.lib.api.parsers import TypedFileUploadParser
+from common.djangoapps.util.json_request import expect_json_in_class_view
+
+from ....api import course_author_access_required
+
+from cms.djangoapps.contentstore.video_storage_handlers import (
+    handle_videos,
+    get_video_encodings_download,
+    handle_video_images,
+    enabled_video_features
+)
+from cms.djangoapps.contentstore.rest_api.v1.serializers import (
+    VideoUploadSerializer,
+    VideoImageSerializer,
+)
+import cms.djangoapps.contentstore.toggles as contentstore_toggles
+from .utils import validate_request_with_serializer
+
+
+log = logging.getLogger(__name__)
+toggles = contentstore_toggles
+
+
+@view_auth_classes()
+class VideosUploadsView(DeveloperErrorViewMixin, RetrieveAPIView, DestroyAPIView):
+    """
+    public rest API endpoints for the CMS API video assets.
+    course_key: required argument, needed to authorize course authors and identify the video.
+    video_id: required argument, needed to identify the video.
+    """
+    serializer_class = VideoUploadSerializer
+
+    def dispatch(self, request, *args, **kwargs):
+        # TODO: probably want to refactor this to a decorator.
+        """
+        The dispatch method of a View class handles HTTP requests in general
+        and calls other methods to handle specific HTTP methods.
+        We use this to raise a 404 if the content api is disabled.
+        """
+        if not toggles.use_studio_content_api():
+            raise Http404
+        return super().dispatch(request, *args, **kwargs)
+
+    @course_author_access_required
+    def retrieve(self, request, course_key, edx_video_id=None):  # pylint: disable=arguments-differ
+        return handle_videos(request, course_key.html_id(), edx_video_id)
+
+    @course_author_access_required
+    @expect_json_in_class_view
+    def destroy(self, request, course_key, edx_video_id):  # pylint: disable=arguments-differ
+        return handle_videos(request, course_key.html_id(), edx_video_id)
+
+
+@view_auth_classes()
+class VideosCreateUploadView(DeveloperErrorViewMixin, CreateAPIView):
+    """
+    public rest API endpoints for the CMS API video assets.
+    course_key: required argument, needed to authorize course authors and identify the video.
+    """
+    serializer_class = VideoUploadSerializer
+
+    def dispatch(self, request, *args, **kwargs):
+        # TODO: probably want to refactor this to a decorator.
+        """
+        The dispatch method of a View class handles HTTP requests in general
+        and calls other methods to handle specific HTTP methods.
+        We use this to raise a 404 if the content api is disabled.
+        """
+        if not toggles.use_studio_content_api():
+            raise Http404
+        return super().dispatch(request, *args, **kwargs)
+
+    @csrf_exempt
+    @course_author_access_required
+    @expect_json_in_class_view
+    @validate_request_with_serializer
+    def create(self, request, course_key):  # pylint: disable=arguments-differ
+        return handle_videos(request, course_key.html_id())
+
+
+@view_auth_classes()
+class VideoImagesView(DeveloperErrorViewMixin, CreateAPIView):
+    """
+    public rest API endpoint for uploading a video image.
+    course_key: required argument, needed to authorize course authors and identify the video.
+    video_id: required argument, needed to identify the video.
+    """
+    serializer_class = VideoImageSerializer
+    parser_classes = (MultiPartParser, FormParser, TypedFileUploadParser)
+
+    def dispatch(self, request, *args, **kwargs):
+        # TODO: probably want to refactor this to a decorator.
+        """
+        The dispatch method of a View class handles HTTP requests in general
+        and calls other methods to handle specific HTTP methods.
+        We use this to raise a 404 if the content api is disabled.
+        """
+        if not toggles.use_studio_content_api():
+            raise Http404
+        return super().dispatch(request, *args, **kwargs)
+
+    @csrf_exempt
+    @course_author_access_required
+    @expect_json_in_class_view
+    @validate_request_with_serializer
+    def create(self, request, course_key, edx_video_id=None):  # pylint: disable=arguments-differ
+        return handle_video_images(request, course_key.html_id(), edx_video_id)
+
+
+@view_auth_classes()
+class VideoEncodingsDownloadView(DeveloperErrorViewMixin, RetrieveAPIView):
+    """
+    public rest API endpoint providing a CSV report containing the encoded video URLs for video uploads.
+    course_key: required argument, needed to authorize course authors and identify relevant videos.
+    """
+
+    def dispatch(self, request, *args, **kwargs):
+        # TODO: probably want to refactor this to a decorator.
+        """
+        The dispatch method of a View class handles HTTP requests in general
+        and calls other methods to handle specific HTTP methods.
+        We use this to raise a 404 if the content api is disabled.
+        """
+        if not toggles.use_studio_content_api():
+            raise Http404
+        return super().dispatch(request, *args, **kwargs)
+
+    @csrf_exempt
+    @course_author_access_required
+    def retrieve(self, request, course_key):  # pylint: disable=arguments-differ
+        return get_video_encodings_download(request, course_key.html_id())
+
+
+@view_auth_classes()
+class VideoFeaturesView(DeveloperErrorViewMixin, RetrieveAPIView):
+    """
+    public rest API endpoint providing a list of enabled video features.
+    """
+
+    def dispatch(self, request, *args, **kwargs):
+        # TODO: probably want to refactor this to a decorator.
+        """
+        The dispatch method of a View class handles HTTP requests in general
+        and calls other methods to handle specific HTTP methods.
+        We use this to raise a 404 if the content api is disabled.
+        """
+        if not toggles.use_studio_content_api():
+            raise Http404
+        return super().dispatch(request, *args, **kwargs)
+
+    @csrf_exempt
+    def retrieve(self, request):  # pylint: disable=arguments-differ
+        return enabled_video_features(request)
diff --git a/cms/djangoapps/contentstore/rest_api/v1/views/transcripts.py b/cms/djangoapps/contentstore/rest_api/v0/views/transcripts.py
similarity index 91%
rename from cms/djangoapps/contentstore/rest_api/v1/views/transcripts.py
rename to cms/djangoapps/contentstore/rest_api/v0/views/transcripts.py
index f621929f9cc7..c97261c4292e 100644
--- a/cms/djangoapps/contentstore/rest_api/v1/views/transcripts.py
+++ b/cms/djangoapps/contentstore/rest_api/v0/views/transcripts.py
@@ -13,7 +13,7 @@
 from openedx.core.lib.api.view_utils import DeveloperErrorViewMixin, view_auth_classes
 from common.djangoapps.util.json_request import expect_json_in_class_view
 
-from ....api import course_author_access_required
+from cms.djangoapps.contentstore.api import course_author_access_required
 
 from cms.djangoapps.contentstore.transcript_storage_handlers import (
     upload_transcript,
@@ -21,11 +21,11 @@
     handle_transcript_download,
 )
 import cms.djangoapps.contentstore.toggles as contentstore_toggles
-from cms.djangoapps.contentstore.rest_api.v1.serializers import TranscriptSerializer
+from ..serializers import TranscriptSerializer
 from rest_framework.parsers import (MultiPartParser, FormParser)
 from openedx.core.lib.api.parsers import TypedFileUploadParser
 
-from .utils import validate_request_with_serializer
+from cms.djangoapps.contentstore.rest_api.v0.views.utils import validate_request_with_serializer
 
 log = logging.getLogger(__name__)
 toggles = contentstore_toggles
diff --git a/cms/djangoapps/contentstore/rest_api/v1/views/utils.py b/cms/djangoapps/contentstore/rest_api/v0/views/utils.py
similarity index 100%
rename from cms/djangoapps/contentstore/rest_api/v1/views/utils.py
rename to cms/djangoapps/contentstore/rest_api/v0/views/utils.py
diff --git a/cms/djangoapps/contentstore/rest_api/v1/views/xblock.py b/cms/djangoapps/contentstore/rest_api/v0/views/xblock.py
similarity index 97%
rename from cms/djangoapps/contentstore/rest_api/v1/views/xblock.py
rename to cms/djangoapps/contentstore/rest_api/v0/views/xblock.py
index ffeceb0265fc..cc26619fb83a 100644
--- a/cms/djangoapps/contentstore/rest_api/v1/views/xblock.py
+++ b/cms/djangoapps/contentstore/rest_api/v0/views/xblock.py
@@ -13,7 +13,7 @@
 from cms.djangoapps.contentstore.xblock_storage_handlers import view_handlers
 import cms.djangoapps.contentstore.toggles as contentstore_toggles
 
-from cms.djangoapps.contentstore.rest_api.v1.serializers import XblockSerializer
+from ..serializers import XblockSerializer
 from .utils import validate_request_with_serializer
 
 
diff --git a/cms/djangoapps/contentstore/rest_api/v1/serializers/__init__.py b/cms/djangoapps/contentstore/rest_api/v1/serializers/__init__.py
index a5c349799824..ac1f2cd1fb54 100644
--- a/cms/djangoapps/contentstore/rest_api/v1/serializers/__init__.py
+++ b/cms/djangoapps/contentstore/rest_api/v1/serializers/__init__.py
@@ -1,11 +1,11 @@
 """
 Serializers for v1 contentstore API.
 """
-from .home import CourseHomeSerializer
 from .course_details import CourseDetailsSerializer
-from .course_team import CourseTeamSerializer
 from .course_rerun import CourseRerunSerializer
+from .course_team import CourseTeamSerializer
 from .grading import CourseGradingModelSerializer, CourseGradingSerializer
+from .home import CourseHomeSerializer
 from .proctoring import (
     LimitedProctoredExamSettingsSerializer,
     ProctoredExamConfigurationSerializer,
@@ -13,7 +13,9 @@
     ProctoringErrorsSerializer
 )
 from .settings import CourseSettingsSerializer
-from .xblock import XblockSerializer
-from .videos import VideoUploadSerializer, VideoImageSerializer
-from .transcripts import TranscriptSerializer
-from .assets import AssetSerializer
+from .videos import (
+    CourseVideosSerializer,
+    VideoUploadSerializer,
+    VideoImageSerializer,
+    VideoUsageSerializer
+)
diff --git a/cms/djangoapps/contentstore/rest_api/v1/serializers/home.py b/cms/djangoapps/contentstore/rest_api/v1/serializers/home.py
index 5abcda673aa7..12816a8cbd1d 100644
--- a/cms/djangoapps/contentstore/rest_api/v1/serializers/home.py
+++ b/cms/djangoapps/contentstore/rest_api/v1/serializers/home.py
@@ -6,7 +6,7 @@
 
 from openedx.core.lib.api.serializers import CourseKeyField
 
-from .common import CourseCommonSerializer
+from cms.djangoapps.contentstore.rest_api.serializers.common import CourseCommonSerializer
 
 
 class UnsucceededCourseSerializer(serializers.Serializer):
@@ -47,7 +47,9 @@ class CourseHomeSerializer(serializers.Serializer):
     in_process_course_actions = UnsucceededCourseSerializer(many=True, required=False, allow_null=True)
     libraries = LibraryViewSerializer(many=True, required=False, allow_null=True)
     libraries_enabled = serializers.BooleanField()
+    taxonomies_enabled = serializers.BooleanField()
     library_authoring_mfe_url = serializers.CharField()
+    taxonomy_list_mfe_url = serializers.CharField()
     optimization_enabled = serializers.BooleanField()
     redirect_to_library_authoring_mfe = serializers.BooleanField()
     request_course_creator_url = serializers.CharField()
diff --git a/cms/djangoapps/contentstore/rest_api/v1/serializers/settings.py b/cms/djangoapps/contentstore/rest_api/v1/serializers/settings.py
index 742d198a7ad4..1c9f9f608478 100644
--- a/cms/djangoapps/contentstore/rest_api/v1/serializers/settings.py
+++ b/cms/djangoapps/contentstore/rest_api/v1/serializers/settings.py
@@ -4,7 +4,7 @@
 
 from rest_framework import serializers
 
-from .common import CourseCommonSerializer
+from cms.djangoapps.contentstore.rest_api.serializers.common import CourseCommonSerializer
 
 
 class CourseSettingsSerializer(serializers.Serializer):
diff --git a/cms/djangoapps/contentstore/rest_api/v1/serializers/videos.py b/cms/djangoapps/contentstore/rest_api/v1/serializers/videos.py
index c08856d1b511..89f566f0abfb 100644
--- a/cms/djangoapps/contentstore/rest_api/v1/serializers/videos.py
+++ b/cms/djangoapps/contentstore/rest_api/v1/serializers/videos.py
@@ -2,7 +2,7 @@
 API Serializers for videos
 """
 from rest_framework import serializers
-from .common import StrictSerializer
+from cms.djangoapps.contentstore.rest_api.serializers.common import StrictSerializer
 
 
 class FileSpecSerializer(StrictSerializer):
@@ -11,6 +11,106 @@ class FileSpecSerializer(StrictSerializer):
     content_type = serializers.ChoiceField(choices=['video/mp4', 'video/webm', 'video/ogg'])
 
 
+class VideoImageSettingsSerializer(serializers.Serializer):
+    """Serializer for image settings"""
+    video_image_upload_enabled = serializers.BooleanField()
+    max_size = serializers.IntegerField()
+    min_size = serializers.IntegerField()
+    max_width = serializers.IntegerField()
+    max_height = serializers.IntegerField()
+    supported_file_formats = serializers.DictField(
+        child=serializers.CharField()
+    )
+
+
+class VideoTranscriptSettingsSerializer(serializers.Serializer):
+    """Serializer for transcript settings"""
+    transcript_download_handler_url = serializers.CharField()
+    transcript_upload_handler_url = serializers.CharField()
+    transcript_delete_handler_url = serializers.CharField()
+    trancript_download_file_format = serializers.CharField()
+    transcript_preferences_handler_url = serializers.CharField(required=False, allow_null=True)
+    transcript_credentials_handler_url = serializers.CharField(required=False, allow_null=True)
+    transcription_plans = serializers.DictField(
+        child=serializers.DictField(),
+        required=False,
+        allow_null=True,
+    )
+
+
+class VideoModelSerializer(serializers.Serializer):
+    """Serializer for a video"""
+    client_video_id = serializers.CharField()
+    course_video_image_url = serializers.CharField()
+    created = serializers.CharField()
+    duration = serializers.FloatField()
+    edx_video_id = serializers.CharField()
+    error_description = serializers.CharField()
+    status = serializers.CharField()
+    file_size = serializers.IntegerField()
+    download_link = serializers.CharField()
+    transcript_urls = serializers.DictField(
+        child=serializers.CharField()
+    )
+    transcription_status = serializers.CharField()
+    transcripts = serializers.ListField(
+        child=serializers.CharField()
+    )
+
+
+class VideoActiveTranscriptPreferencesSerializer(serializers.Serializer):
+    """Serializer for a videos active transcript preferences"""
+    course_id = serializers.CharField()
+    provider = serializers.CharField()
+    cielo24_fidelity = serializers.CharField()
+    cielo24_turnaround = serializers.CharField()
+    three_play_turnaround = serializers.CharField()
+    preferred_languages = serializers.ListField(
+        child=serializers.CharField()
+    )
+    video_source_language = serializers.CharField()
+    modified = serializers.CharField()
+
+
+class CourseVideosSerializer(serializers.Serializer):
+    """Serializer for course videos"""
+    image_upload_url = serializers.CharField()
+    video_handler_url = serializers.CharField()
+    encodings_download_url = serializers.CharField()
+    default_video_image_url = serializers.CharField()
+    previous_uploads = VideoModelSerializer(many=True, required=False)
+    concurrent_upload_limit = serializers.IntegerField()
+    video_supported_file_formats = serializers.ListField(
+        child=serializers.CharField()
+    )
+    video_upload_max_file_size = serializers.CharField()
+    video_image_settings = VideoImageSettingsSerializer(required=True, allow_null=False)
+    is_video_transcript_enabled = serializers.BooleanField()
+    active_transcript_preferences = VideoActiveTranscriptPreferencesSerializer(required=False, allow_null=True)
+    transcript_credentials = serializers.DictField(
+        child=serializers.BooleanField()
+    )
+    transcript_available_languages = serializers.ListField(
+        child=serializers.DictField(
+            child=serializers.CharField()
+        )
+    )
+    # transcript_available_languages = serializers.BooleanField(required=False, allow_null=True)
+    video_transcript_settings = VideoTranscriptSettingsSerializer()
+    pagination_context = serializers.DictField(
+        child=serializers.CharField(),
+        required=False,
+        allow_null=True,
+    )
+
+
+class VideoUsageSerializer(serializers.Serializer):
+    """Serializer for video usage"""
+    usage_locations = serializers.ListField(
+        child=serializers.CharField()
+    )
+
+
 class VideoUploadSerializer(StrictSerializer):
     """
     Strict Serializer for video upload urls.
diff --git a/cms/djangoapps/contentstore/rest_api/v1/urls.py b/cms/djangoapps/contentstore/rest_api/v1/urls.py
index d0ead20ffe45..ad5765a67396 100644
--- a/cms/djangoapps/contentstore/rest_api/v1/urls.py
+++ b/cms/djangoapps/contentstore/rest_api/v1/urls.py
@@ -1,6 +1,5 @@
 """ Contenstore API v1 URLs. """
 
-from django.conf import settings
 from django.urls import re_path, path
 
 from openedx.core.constants import COURSE_ID_PATTERN
@@ -11,14 +10,12 @@
     CourseGradingView,
     CourseRerunView,
     CourseSettingsView,
+    CourseVideosView,
     HomePageView,
     ProctoredExamSettingsView,
     ProctoringErrorsView,
-    xblock,
-    assets,
-    videos,
-    transcripts,
     HelpUrlsView,
+    VideoUsageView
 )
 
 app_name = 'v1'
@@ -31,6 +28,16 @@
         HomePageView.as_view(),
         name="home"
     ),
+    re_path(
+        fr'^videos/{COURSE_ID_PATTERN}$',
+        CourseVideosView.as_view(),
+        name="course_videos"
+    ),
+    re_path(
+        fr'^videos/{COURSE_ID_PATTERN}/{VIDEO_ID_PATTERN}/usage$',
+        VideoUsageView.as_view(),
+        name="video_usage"
+    ),
     re_path(
         fr'^proctored_exam_settings/{COURSE_ID_PATTERN}$',
         ProctoredExamSettingsView.as_view(),
@@ -72,45 +79,6 @@
         name="course_rerun"
     ),
 
-    # CMS API
-    re_path(
-        fr'^file_assets/{settings.COURSE_ID_PATTERN}/$',
-        assets.AssetsCreateRetrieveView.as_view(), name='cms_api_create_retrieve_assets'
-    ),
-    re_path(
-        fr'^file_assets/{settings.COURSE_ID_PATTERN}/{settings.ASSET_KEY_PATTERN}$',
-        assets.AssetsUpdateDestroyView.as_view(), name='cms_api_update_destroy_assets'
-    ),
-    re_path(
-        fr'^videos/encodings/{settings.COURSE_ID_PATTERN}$',
-        videos.VideoEncodingsDownloadView.as_view(), name='cms_api_videos_encodings'
-    ),
-    path(
-        'videos/features/',
-        videos.VideoFeaturesView.as_view(), name='cms_api_videos_features'
-    ),
-    re_path(
-        fr'^videos/images/{settings.COURSE_ID_PATTERN}/{VIDEO_ID_PATTERN}$',
-        videos.VideoImagesView.as_view(), name='cms_api_videos_images'
-    ),
-    re_path(
-        fr'^videos/uploads/{settings.COURSE_ID_PATTERN}/$',
-        videos.VideosCreateUploadView.as_view(), name='cms_api_create_videos_upload'
-    ),
-    re_path(
-        fr'^videos/uploads/{settings.COURSE_ID_PATTERN}/{VIDEO_ID_PATTERN}$',
-        videos.VideosUploadsView.as_view(), name='cms_api_videos_uploads'
-    ),
-    re_path(
-        fr'^video_transcripts/{settings.COURSE_ID_PATTERN}$',
-        transcripts.TranscriptView.as_view(), name='cms_api_video_transcripts'
-    ),
-    re_path(
-        fr'^xblock/{settings.COURSE_ID_PATTERN}/$',
-        xblock.XblockCreateView.as_view(), name='cms_api_create_xblock'
-    ),
-    re_path(
-        fr'^xblock/{settings.COURSE_ID_PATTERN}/{settings.USAGE_KEY_PATTERN}$',
-        xblock.XblockView.as_view(), name='cms_api_xblock'
-    ),
+    # Authoring API
+    # Do not use under v1 yet (Nov. 23). The Authoring API is still experimental and the v0 versions should be used
 ]
diff --git a/cms/djangoapps/contentstore/rest_api/v1/views/__init__.py b/cms/djangoapps/contentstore/rest_api/v1/views/__init__.py
index 2d0da478e506..780f0059aaed 100644
--- a/cms/djangoapps/contentstore/rest_api/v1/views/__init__.py
+++ b/cms/djangoapps/contentstore/rest_api/v1/views/__init__.py
@@ -8,13 +8,8 @@
 from .proctoring import ProctoredExamSettingsView, ProctoringErrorsView
 from .home import HomePageView
 from .settings import CourseSettingsView
-from .xblock import XblockView, XblockCreateView
-from .assets import AssetsCreateRetrieveView, AssetsUpdateDestroyView
 from .videos import (
-    VideosUploadsView,
-    VideosCreateUploadView,
-    VideoImagesView,
-    VideoEncodingsDownloadView,
-    VideoFeaturesView
+    CourseVideosView,
+    VideoUsageView,
 )
 from .help_urls import HelpUrlsView
diff --git a/cms/djangoapps/contentstore/rest_api/v1/views/tests/test_home.py b/cms/djangoapps/contentstore/rest_api/v1/views/tests/test_home.py
index 110ee24ba150..99f1b450cc0d 100644
--- a/cms/djangoapps/contentstore/rest_api/v1/views/tests/test_home.py
+++ b/cms/djangoapps/contentstore/rest_api/v1/views/tests/test_home.py
@@ -4,11 +4,15 @@
 import ddt
 from django.conf import settings
 from django.urls import reverse
-from edx_toggles.toggles.testutils import override_waffle_switch
+from edx_toggles.toggles.testutils import (
+    override_waffle_switch,
+    override_waffle_flag,
+)
 from rest_framework import status
 
 from cms.djangoapps.contentstore.tests.utils import CourseTestCase
 from cms.djangoapps.contentstore.views.course import ENABLE_GLOBAL_STAFF_OPTIMIZATION
+from cms.djangoapps.contentstore.toggles import ENABLE_TAGGING_TAXONOMY_LIST_PAGE
 from openedx.core.djangoapps.content.course_overviews.tests.factories import CourseOverviewFactory
 from xmodule.modulestore.tests.factories import CourseFactory
 
@@ -49,7 +53,9 @@ def test_home_page_response(self):
             "in_process_course_actions": [],
             "libraries": [],
             "libraries_enabled": True,
+            "taxonomies_enabled": False,
             "library_authoring_mfe_url": settings.LIBRARY_AUTHORING_MICROFRONTEND_URL,
+            "taxonomy_list_mfe_url": None,
             "optimization_enabled": False,
             "redirect_to_library_authoring_mfe": False,
             "request_course_creator_url": "/request_course_creator",
@@ -87,3 +93,12 @@ def test_org_query_if_empty(self):
         response = self.client.get(self.url)
         self.assertEqual(len(response.data['courses']), 0)
         self.assertEqual(response.status_code, status.HTTP_200_OK)
+
+    @override_waffle_flag(ENABLE_TAGGING_TAXONOMY_LIST_PAGE, True)
+    def test_taxonomy_list_link(self):
+        response = self.client.get(self.url)
+        self.assertTrue(response.data['taxonomies_enabled'])
+        self.assertEqual(
+            response.data['taxonomy_list_mfe_url'],
+            f'{settings.COURSE_AUTHORING_MICROFRONTEND_URL}/taxonomy-list'
+        )
diff --git a/cms/djangoapps/contentstore/rest_api/v1/views/tests/test_videos.py b/cms/djangoapps/contentstore/rest_api/v1/views/tests/test_videos.py
new file mode 100644
index 000000000000..d5d277c498dc
--- /dev/null
+++ b/cms/djangoapps/contentstore/rest_api/v1/views/tests/test_videos.py
@@ -0,0 +1,128 @@
+"""
+Unit tests for course settings views.
+"""
+import ddt
+from django.conf import settings
+from django.contrib.staticfiles.storage import staticfiles_storage
+from django.urls import reverse
+from edx_toggles.toggles import WaffleSwitch
+from edx_toggles.toggles.testutils import override_waffle_switch
+from edxval.api import (
+    get_3rd_party_transcription_plans,
+    get_transcript_credentials_state_for_org,
+    get_transcript_preferences,
+)
+from mock import patch
+from rest_framework import status
+
+from cms.djangoapps.contentstore.video_storage_handlers import get_all_transcript_languages
+from cms.djangoapps.contentstore.tests.utils import CourseTestCase
+from cms.djangoapps.contentstore.utils import reverse_course_url
+
+from ...mixins import PermissionAccessMixin
+
+
+@ddt.ddt
+class CourseVideosViewTest(CourseTestCase, PermissionAccessMixin):
+    """
+    Tests for CourseVideosView.
+    """
+
+    def setUp(self):
+        super().setUp()
+        self.url = reverse(
+            "cms.djangoapps.contentstore:v1:course_videos",
+            kwargs={"course_id": self.course.id},
+        )
+
+    def test_course_videos_response(self):
+        """Check successful response content"""
+        response = self.client.get(self.url)
+        expected_response = {
+            "image_upload_url": reverse_course_url("video_images_handler", str(self.course.id)),
+            "video_handler_url": reverse_course_url("videos_handler", str(self.course.id)),
+            "encodings_download_url": reverse_course_url("video_encodings_download", str(self.course.id)),
+            "default_video_image_url": staticfiles_storage.url(settings.VIDEO_IMAGE_DEFAULT_FILENAME),
+            "previous_uploads": [],
+            "concurrent_upload_limit": settings.VIDEO_UPLOAD_PIPELINE.get("CONCURRENT_UPLOAD_LIMIT", 0),
+            "video_supported_file_formats": [".mp4", ".mov"],
+            "video_upload_max_file_size": "5",
+            "video_image_settings": {
+                "video_image_upload_enabled": False,
+                "max_size": settings.VIDEO_IMAGE_SETTINGS["VIDEO_IMAGE_MAX_BYTES"],
+                "min_size": settings.VIDEO_IMAGE_SETTINGS["VIDEO_IMAGE_MIN_BYTES"],
+                "max_width": settings.VIDEO_IMAGE_MAX_WIDTH,
+                "max_height": settings.VIDEO_IMAGE_MAX_HEIGHT,
+                "supported_file_formats": settings.VIDEO_IMAGE_SUPPORTED_FILE_FORMATS
+            },
+            "is_video_transcript_enabled": False,
+            "active_transcript_preferences": None,
+            "transcript_credentials": None,
+            "transcript_available_languages": get_all_transcript_languages(),
+            "video_transcript_settings": {
+                "transcript_download_handler_url": reverse('transcript_download_handler'),
+                "transcript_upload_handler_url": reverse('transcript_upload_handler'),
+                "transcript_delete_handler_url": reverse_course_url("transcript_delete_handler", str(self.course.id)),
+                "trancript_download_file_format": "srt",
+                "transcript_preferences_handler_url": None,
+                "transcript_credentials_handler_url": None,
+                "transcription_plans": None
+            },
+            "pagination_context": {}
+        }
+
+        self.assertEqual(response.status_code, status.HTTP_200_OK)
+        self.assertDictEqual(expected_response, response.data)
+
+    @override_waffle_switch(WaffleSwitch(  # lint-amnesty, pylint: disable=toggle-missing-annotation
+        'videos.video_image_upload_enabled', __name__
+    ), True)
+    def test_video_image_upload_enabled(self):
+        """
+        Make sure if the feature flag is enabled we have updated the dict keys in response.
+        """
+        response = self.client.get(self.url)
+        self.assertEqual(response.status_code, status.HTTP_200_OK)
+        self.assertIn("video_image_settings", response.data)
+
+        imageSettings = response.data["video_image_settings"]
+        self.assertIn("video_image_upload_enabled", imageSettings)
+        self.assertTrue(imageSettings["video_image_upload_enabled"])
+
+    def test_VideoTranscriptEnabledFlag_enabled(self):
+        """
+        Make sure if the feature flags are enabled we have updated the dict keys in response.
+        """
+        with patch('openedx.core.djangoapps.video_config.models.VideoTranscriptEnabledFlag.feature_enabled') as feature:
+            feature.return_value = True
+            response = self.client.get(self.url)
+            self.assertIn("is_video_transcript_enabled", response.data)
+            self.assertTrue(response.data["is_video_transcript_enabled"])
+
+            expect_active_preferences = get_transcript_preferences(str(self.course.id))
+            self.assertIn("active_transcript_preferences", response.data)
+            self.assertEqual(expect_active_preferences, response.data["active_transcript_preferences"])
+
+            expected_credentials = get_transcript_credentials_state_for_org(self.course.id.org)
+            self.assertIn("transcript_credentials", response.data)
+            self.assertDictEqual(expected_credentials, response.data["transcript_credentials"])
+
+            transcript_settings = response.data["video_transcript_settings"]
+
+            expected_plans = get_3rd_party_transcription_plans()
+            self.assertIn("transcription_plans", transcript_settings)
+            self.assertDictEqual(expected_plans, transcript_settings["transcription_plans"])
+
+            expected_preference_handler = reverse_course_url(
+                'transcript_preferences_handler',
+                str(self.course.id)
+            )
+            self.assertIn("transcript_preferences_handler_url", transcript_settings)
+            self.assertEqual(expected_preference_handler, transcript_settings["transcript_preferences_handler_url"])
+
+            expected_credentials_handler = reverse_course_url(
+                'transcript_credentials_handler',
+                str(self.course.id)
+            )
+            self.assertIn("transcript_credentials_handler_url", transcript_settings)
+            self.assertEqual(expected_credentials_handler, transcript_settings["transcript_credentials_handler_url"])
diff --git a/cms/djangoapps/contentstore/rest_api/v1/views/videos.py b/cms/djangoapps/contentstore/rest_api/v1/views/videos.py
index 417490692fe1..b6d6dcfbae20 100644
--- a/cms/djangoapps/contentstore/rest_api/v1/views/videos.py
+++ b/cms/djangoapps/contentstore/rest_api/v1/views/videos.py
@@ -1,164 +1,182 @@
 """
-Public rest API endpoints for the CMS API video assets.
+Public rest API endpoints for contentstore API video assets (outside authoring API)
 """
+import edx_api_doc_tools as apidocs
 import logging
-from rest_framework.generics import (
-    CreateAPIView,
-    RetrieveAPIView,
-    DestroyAPIView
-)
-from rest_framework.parsers import (MultiPartParser, FormParser)
-from django.views.decorators.csrf import csrf_exempt
-from django.http import Http404
+from opaque_keys.edx.keys import CourseKey
+from rest_framework.request import Request
+from rest_framework.response import Response
+from rest_framework.views import APIView
 
-from openedx.core.lib.api.view_utils import DeveloperErrorViewMixin, view_auth_classes
-from openedx.core.lib.api.parsers import TypedFileUploadParser
-from common.djangoapps.util.json_request import expect_json_in_class_view
+from openedx.core.lib.api.view_utils import DeveloperErrorViewMixin, view_auth_classes, verify_course_exists
+from common.djangoapps.student.auth import has_studio_read_access
 
-from ....api import course_author_access_required
+from ....utils import get_course_videos_context
 
 from cms.djangoapps.contentstore.video_storage_handlers import (
-    handle_videos,
-    get_video_encodings_download,
-    handle_video_images,
-    enabled_video_features
+    get_video_usage_path
+)
+from cms.djangoapps.contentstore.rest_api.v1.serializers import (
+    CourseVideosSerializer,
+    VideoUsageSerializer,
 )
-from cms.djangoapps.contentstore.rest_api.v1.serializers import VideoUploadSerializer, VideoImageSerializer
 import cms.djangoapps.contentstore.toggles as contentstore_toggles
-from .utils import validate_request_with_serializer
 
 
 log = logging.getLogger(__name__)
 toggles = contentstore_toggles
 
 
-@view_auth_classes()
-class VideosUploadsView(DeveloperErrorViewMixin, RetrieveAPIView, DestroyAPIView):
+@view_auth_classes(is_authenticated=True)
+class CourseVideosView(DeveloperErrorViewMixin, APIView):
     """
-    public rest API endpoints for the CMS API video assets.
-    course_key: required argument, needed to authorize course authors and identify the video.
-    video_id: required argument, needed to identify the video.
+    View for course videos.
     """
-    serializer_class = VideoUploadSerializer
-
-    def dispatch(self, request, *args, **kwargs):
-        # TODO: probably want to refactor this to a decorator.
+    @apidocs.schema(
+        parameters=[
+            apidocs.string_parameter("course_id", apidocs.ParameterLocation.PATH, description="Course ID"),
+        ],
+        responses={
+            200: CourseVideosSerializer,
+            401: "The requester is not authenticated",
+            403: "The requester cannot access the specified course",
+            404: "The requested course does not exist",
+        },
+    )
+    @verify_course_exists()
+    def get(self, request: Request, course_id: str):
         """
-        The dispatch method of a View class handles HTTP requests in general
-        and calls other methods to handle specific HTTP methods.
-        We use this to raise a 404 if the content api is disabled.
+        Get an object containing course videos.
+        **Example Request**
+            GET /api/contentstore/v1/videos/{course_id}/{edx_video_id}
+        **Response Values**
+        If the request is successful, an HTTP 200 "OK" response is returned.
+        The HTTP 200 response contains a single dict that contains keys that
+        are the course's videos.
+        **Example Response**
+        ```json
+        {
+            image_upload_url: '/video_images/course_id',
+            video_handler_url: '/videos/course_id',
+            encodings_download_url: '/video_encodings_download/course_id',
+            default_video_image_url: '/static/studio/images/video-images/default_video_image.png',
+            previous_uploads: [
+                {
+                    edx_video_id: 'mOckID1',
+                    clientVideoId: 'mOckID1.mp4',
+                    created: '',
+                    courseVideoImageUrl: '/video',
+                    transcripts: [],
+                    status: 'Imported',
+                    file_size: 123,
+                    download_link: 'http:/download_video.com'
+                },
+                {
+                    edx_video_id: 'mOckID5',
+                    clientVideoId: 'mOckID5.mp4',
+                    created: '',
+                    courseVideoImageUrl: 'http:/video',
+                    transcripts: ['en'],
+                    status: 'Failed',
+                    file_size: 0,
+                    download_link: ''
+                },
+                {
+                    edx_video_id: 'mOckID3',
+                    clientVideoId: 'mOckID3.mp4',
+                    created: '',
+                    courseVideoImageUrl: null,
+                    transcripts: ['en'],
+                    status: 'Ready',
+                    file_size: 123,
+                    download_link: 'http:/download_video.com'
+                },
+            ],
+            concurrent_upload_limit: 4,
+            video_supported_file_formats: ['.mp4', '.mov'],
+            video_upload_max_file_size: '5',
+            video_image_settings: {
+                video_image_upload_enabled: false,
+                max_size: 2097152,
+                min_size: 2048,
+                max_width: 1280,
+                max_height: 720,
+                supported_file_formats: {
+                    '.bmp': 'image/bmp',
+                    '.bmp2': 'image/x-ms-bmp',
+                    '.gif': 'image/gif',
+                    '.jpg': 'image/jpeg',
+                    '.jpeg': 'image/jpeg',
+                    '.png': 'image/png',
+                },
+            },
+            is_video_transcript_enabled: false,
+            active_transcript_preferences: null,
+            transcript_credentials: {},
+            transcript_available_languages: [{ language_code: 'ab', language_text: 'Abkhazian' }],
+            video_transcript_settings: {
+                transcript_download_handler_url: '/transcript_download/',
+                transcript_upload_handler_url: '/transcript_upload/',
+                transcript_delete_handler_url: '/transcript_delete/course_id',
+                trancript_download_file_format: 'srt',
+            },
+            pagination_context: {},
+        }
+        ```
         """
-        if not toggles.use_studio_content_api():
-            raise Http404
-        return super().dispatch(request, *args, **kwargs)
-
-    @course_author_access_required
-    def retrieve(self, request, course_key, edx_video_id=None):  # pylint: disable=arguments-differ
-        return handle_videos(request, course_key.html_id(), edx_video_id)
-
-    @course_author_access_required
-    @expect_json_in_class_view
-    def destroy(self, request, course_key, edx_video_id):  # pylint: disable=arguments-differ
-        return handle_videos(request, course_key.html_id(), edx_video_id)
-
-
-@view_auth_classes()
-class VideosCreateUploadView(DeveloperErrorViewMixin, CreateAPIView):
-    """
-    public rest API endpoints for the CMS API video assets.
-    course_key: required argument, needed to authorize course authors and identify the video.
-    """
-    serializer_class = VideoUploadSerializer
+        course_key = CourseKey.from_string(course_id)
 
-    def dispatch(self, request, *args, **kwargs):
-        # TODO: probably want to refactor this to a decorator.
-        """
-        The dispatch method of a View class handles HTTP requests in general
-        and calls other methods to handle specific HTTP methods.
-        We use this to raise a 404 if the content api is disabled.
-        """
-        if not toggles.use_studio_content_api():
-            raise Http404
-        return super().dispatch(request, *args, **kwargs)
+        if not has_studio_read_access(request.user, course_key):
+            self.permission_denied(request)
 
-    @csrf_exempt
-    @course_author_access_required
-    @expect_json_in_class_view
-    @validate_request_with_serializer
-    def create(self, request, course_key):  # pylint: disable=arguments-differ
-        return handle_videos(request, course_key.html_id())
+        course_videos_context = get_course_videos_context(
+            None,
+            None,
+            course_key,
+        )
+        serializer = CourseVideosSerializer(course_videos_context)
+        return Response(serializer.data)
 
 
-@view_auth_classes()
-class VideoImagesView(DeveloperErrorViewMixin, CreateAPIView):
+@view_auth_classes(is_authenticated=True)
+class VideoUsageView(DeveloperErrorViewMixin, APIView):
     """
-    public rest API endpoint for uploading a video image.
-    course_key: required argument, needed to authorize course authors and identify the video.
-    video_id: required argument, needed to identify the video.
+    View for course video usage locations.
     """
-    serializer_class = VideoImageSerializer
-    parser_classes = (MultiPartParser, FormParser, TypedFileUploadParser)
-
-    def dispatch(self, request, *args, **kwargs):
-        # TODO: probably want to refactor this to a decorator.
+    @apidocs.schema(
+        parameters=[
+            apidocs.string_parameter("course_id", apidocs.ParameterLocation.PATH, description="Course ID"),
+            apidocs.string_parameter("edx_video_id", apidocs.ParameterLocation.PATH, description="edX Video ID"),
+        ],
+        responses={
+            200: VideoUsageSerializer,
+            401: "The requester is not authenticated",
+            403: "The requester cannot access the specified course",
+            404: "The requested course does not exist",
+        },
+    )
+    @verify_course_exists()
+    def get(self, request: Request, course_id: str, edx_video_id: str):
         """
-        The dispatch method of a View class handles HTTP requests in general
-        and calls other methods to handle specific HTTP methods.
-        We use this to raise a 404 if the content api is disabled.
+        Get an object containing course videos.
+        **Example Request**
+            GET /api/contentstore/v1/videos/{course_id}/{edx_video_id}
+        **Response Values**
+        If the request is successful, an HTTP 200 "OK" response is returned.
+        The HTTP 200 response contains a single dict that contains keys that
+        are the course's videos.
+        **Example Response**
+        ```json
+        {
+            "usage_locations": ["subsection - unit/xblock"],
+        }
+        ```
         """
-        if not toggles.use_studio_content_api():
-            raise Http404
-        return super().dispatch(request, *args, **kwargs)
-
-    @csrf_exempt
-    @course_author_access_required
-    @expect_json_in_class_view
-    @validate_request_with_serializer
-    def create(self, request, course_key, edx_video_id=None):  # pylint: disable=arguments-differ
-        return handle_video_images(request, course_key.html_id(), edx_video_id)
-
+        course_key = CourseKey.from_string(course_id)
 
-@view_auth_classes()
-class VideoEncodingsDownloadView(DeveloperErrorViewMixin, RetrieveAPIView):
-    """
-    public rest API endpoint providing a CSV report containing the encoded video URLs for video uploads.
-    course_key: required argument, needed to authorize course authors and identify relevant videos.
-    """
-
-    def dispatch(self, request, *args, **kwargs):
-        # TODO: probably want to refactor this to a decorator.
-        """
-        The dispatch method of a View class handles HTTP requests in general
-        and calls other methods to handle specific HTTP methods.
-        We use this to raise a 404 if the content api is disabled.
-        """
-        if not toggles.use_studio_content_api():
-            raise Http404
-        return super().dispatch(request, *args, **kwargs)
-
-    @csrf_exempt
-    @course_author_access_required
-    def retrieve(self, request, course_key):  # pylint: disable=arguments-differ
-        return get_video_encodings_download(request, course_key.html_id())
-
-
-@view_auth_classes()
-class VideoFeaturesView(DeveloperErrorViewMixin, RetrieveAPIView):
-    """
-    public rest API endpoint providing a list of enabled video features.
-    """
-
-    def dispatch(self, request, *args, **kwargs):
-        # TODO: probably want to refactor this to a decorator.
-        """
-        The dispatch method of a View class handles HTTP requests in general
-        and calls other methods to handle specific HTTP methods.
-        We use this to raise a 404 if the content api is disabled.
-        """
-        if not toggles.use_studio_content_api():
-            raise Http404
-        return super().dispatch(request, *args, **kwargs)
+        if not has_studio_read_access(request.user, course_key):
+            self.permission_denied(request)
 
-    @csrf_exempt
-    def retrieve(self, request):  # pylint: disable=arguments-differ
-        return enabled_video_features(request)
+        usage_locations = get_video_usage_path(request, course_key, edx_video_id)
+        serializer = VideoUsageSerializer(usage_locations)
+        return Response(serializer.data)
diff --git a/cms/djangoapps/contentstore/signals/handlers.py b/cms/djangoapps/contentstore/signals/handlers.py
index fec46b6b7484..20c14089e0a6 100644
--- a/cms/djangoapps/contentstore/signals/handlers.py
+++ b/cms/djangoapps/contentstore/signals/handlers.py
@@ -13,13 +13,7 @@
 from edx_toggles.toggles import SettingToggle
 from opaque_keys.edx.keys import CourseKey
 from openedx_events.content_authoring.data import CourseCatalogData, CourseScheduleData
-from openedx_events.content_authoring.signals import (
-    COURSE_CATALOG_INFO_CHANGED,
-    XBLOCK_DELETED,
-    XBLOCK_DUPLICATED,
-    XBLOCK_PUBLISHED,
-)
-from openedx_events.event_bus import get_producer
+from openedx_events.content_authoring.signals import COURSE_CATALOG_INFO_CHANGED
 from pytz import UTC
 
 from cms.djangoapps.contentstore.courseware_index import (
@@ -159,60 +153,6 @@ def listen_for_course_publish(sender, course_key, **kwargs):  # pylint: disable=
     transaction.on_commit(lambda: emit_catalog_info_changed_signal(course_key))
 
 
-@receiver(COURSE_CATALOG_INFO_CHANGED)
-def listen_for_course_catalog_info_changed(sender, signal, **kwargs):
-    """
-    Publish COURSE_CATALOG_INFO_CHANGED signals onto the event bus.
-    """
-    get_producer().send(
-        signal=COURSE_CATALOG_INFO_CHANGED, topic='course-catalog-info-changed',
-        event_key_field='catalog_info.course_key', event_data={'catalog_info': kwargs['catalog_info']},
-        event_metadata=kwargs['metadata'],
-    )
-
-
-@receiver(XBLOCK_PUBLISHED)
-def listen_for_xblock_published(sender, signal, **kwargs):
-    """
-    Publish XBLOCK_PUBLISHED signals onto the event bus.
-    """
-    if settings.FEATURES.get("ENABLE_SEND_XBLOCK_EVENTS_OVER_BUS"):
-        topic = getattr(settings, "EVENT_BUS_XBLOCK_LIFECYCLE_TOPIC", "course-authoring-xblock-lifecycle")
-        get_producer().send(
-            signal=XBLOCK_PUBLISHED, topic=topic,
-            event_key_field='xblock_info.usage_key', event_data={'xblock_info': kwargs['xblock_info']},
-            event_metadata=kwargs['metadata'],
-        )
-
-
-@receiver(XBLOCK_DELETED)
-def listen_for_xblock_deleted(sender, signal, **kwargs):
-    """
-    Publish XBLOCK_DELETED signals onto the event bus.
-    """
-    if settings.FEATURES.get("ENABLE_SEND_XBLOCK_EVENTS_OVER_BUS"):
-        topic = getattr(settings, "EVENT_BUS_XBLOCK_LIFECYCLE_TOPIC", "course-authoring-xblock-lifecycle")
-        get_producer().send(
-            signal=XBLOCK_DELETED, topic=topic,
-            event_key_field='xblock_info.usage_key', event_data={'xblock_info': kwargs['xblock_info']},
-            event_metadata=kwargs['metadata'],
-        )
-
-
-@receiver(XBLOCK_DUPLICATED)
-def listen_for_xblock_duplicated(sender, signal, **kwargs):
-    """
-    Publish XBLOCK_DUPLICATED signals onto the event bus.
-    """
-    if settings.FEATURES.get("ENABLE_SEND_XBLOCK_EVENTS_OVER_BUS"):
-        topic = getattr(settings, "EVENT_BUS_XBLOCK_LIFECYCLE_TOPIC", "course-authoring-xblock-lifecycle")
-        get_producer().send(
-            signal=XBLOCK_DUPLICATED, topic=topic,
-            event_key_field='xblock_info.usage_key', event_data={'xblock_info': kwargs['xblock_info']},
-            event_metadata=kwargs['metadata'],
-        )
-
-
 @receiver(SignalHandler.course_deleted)
 def listen_for_course_delete(sender, course_key, **kwargs):  # pylint: disable=unused-argument
     """
diff --git a/cms/djangoapps/contentstore/tests/test_contentstore.py b/cms/djangoapps/contentstore/tests/test_contentstore.py
index 1eb70347399c..b82605f8933f 100644
--- a/cms/djangoapps/contentstore/tests/test_contentstore.py
+++ b/cms/djangoapps/contentstore/tests/test_contentstore.py
@@ -45,7 +45,12 @@
 
 from cms.djangoapps.contentstore.config import waffle
 from cms.djangoapps.contentstore.tests.utils import AjaxEnabledTestClient, CourseTestCase, get_url, parse_json
-from cms.djangoapps.contentstore.utils import delete_course, reverse_course_url, reverse_url
+from cms.djangoapps.contentstore.utils import (
+    delete_course,
+    reverse_course_url,
+    reverse_url,
+    get_taxonomy_tags_widget_url,
+)
 from cms.djangoapps.contentstore.views.component import ADVANCED_COMPONENT_TYPES
 from common.djangoapps.course_action_state.managers import CourseActionStateItemNotFoundError
 from common.djangoapps.course_action_state.models import CourseRerunState, CourseRerunUIStateManager
@@ -1410,12 +1415,16 @@ def test_course_overview_view_with_course(self):
             'assets_handler',
             course.location.course_key
         )
+
+        taxonomy_tags_widget_url = get_taxonomy_tags_widget_url(course.id)
+
         self.assertContains(
             resp,
-            '<article class="outline outline-complex outline-course" data-locator="{locator}" data-course-key="{course_key}" data-course-assets="{assets_url}">'.format(  # lint-amnesty, pylint: disable=line-too-long
+            '<article class="outline outline-complex outline-course" data-locator="{locator}" data-course-key="{course_key}" data-course-assets="{assets_url}" data-taxonomy-tags-widget-url="{taxonomy_tags_widget_url}" >'.format(  # lint-amnesty, pylint: disable=line-too-long
                 locator=str(course.location),
                 course_key=str(course.id),
                 assets_url=assets_url,
+                taxonomy_tags_widget_url=taxonomy_tags_widget_url,
             ),
             status_code=200,
             html=True
diff --git a/cms/djangoapps/contentstore/tests/test_course_create_rerun.py b/cms/djangoapps/contentstore/tests/test_course_create_rerun.py
index fcba8f6e1b39..d9023bfce224 100644
--- a/cms/djangoapps/contentstore/tests/test_course_create_rerun.py
+++ b/cms/djangoapps/contentstore/tests/test_course_create_rerun.py
@@ -51,7 +51,7 @@ def setUp(self):
         self.factory = RequestFactory()
         self.global_admin = AdminFactory()
         self.client = AjaxEnabledTestClient()
-        self.client.login(username=self.user.username, password='test')
+        self.client.login(username=self.user.username, password=self.TEST_PASSWORD)
         self.course_create_rerun_url = reverse('course_handler')
         self.course_start = datetime.datetime.utcnow()
         self.course_end = self.course_start + datetime.timedelta(days=30)
diff --git a/cms/djangoapps/contentstore/tests/test_course_listing.py b/cms/djangoapps/contentstore/tests/test_course_listing.py
index 461a1281f55d..66c16dc6dd8c 100644
--- a/cms/djangoapps/contentstore/tests/test_course_listing.py
+++ b/cms/djangoapps/contentstore/tests/test_course_listing.py
@@ -56,12 +56,12 @@ def setUp(self):
         super().setUp()
         # create and log in a staff user.
         # create and log in a non-staff user
-        self.user = UserFactory()
+        self.user = UserFactory(password=self.TEST_PASSWORD)
         self.factory = RequestFactory()
         self.request = self.factory.get('/course')
         self.request.user = self.user
         self.client = AjaxEnabledTestClient()
-        self.client.login(username=self.user.username, password='test')
+        self.client.login(username=self.user.username, password=self.TEST_PASSWORD)
 
     def _create_course_with_access_groups(self, course_location, user=None):
         """
diff --git a/cms/djangoapps/contentstore/tests/test_course_settings.py b/cms/djangoapps/contentstore/tests/test_course_settings.py
index 605e0d21330e..f19f35efe2db 100644
--- a/cms/djangoapps/contentstore/tests/test_course_settings.py
+++ b/cms/djangoapps/contentstore/tests/test_course_settings.py
@@ -1866,10 +1866,10 @@ def _get_course_details_response(self, global_staff):
         """
         Return the course details page as either global or non-global staff
         """
-        user = UserFactory(is_staff=global_staff)
+        user = UserFactory(is_staff=global_staff, password=self.TEST_PASSWORD)
         CourseInstructorRole(self.course.id).add_users(user)
 
-        self.client.login(username=user.username, password='test')
+        self.client.login(username=user.username, password=self.TEST_PASSWORD)
 
         return self.client.get_html(self.course_details_url)
 
diff --git a/cms/djangoapps/contentstore/tests/test_exams.py b/cms/djangoapps/contentstore/tests/test_exams.py
index 6b2f39687e55..12a54278d208 100644
--- a/cms/djangoapps/contentstore/tests/test_exams.py
+++ b/cms/djangoapps/contentstore/tests/test_exams.py
@@ -60,7 +60,7 @@ def _get_exams_url(self, course_id):
     @ddt.data(
         (False, False, False, 'timed'),
         (True, False, False, 'proctored'),
-        (True, True, False, 'practice_proctored'),
+        (True, True, False, 'practice'),
         (True, True, True, 'onboarding'),
     )
     @ddt.unpack
diff --git a/cms/djangoapps/contentstore/tests/test_i18n.py b/cms/djangoapps/contentstore/tests/test_i18n.py
index dc7740307169..fdab4aef83f1 100644
--- a/cms/djangoapps/contentstore/tests/test_i18n.py
+++ b/cms/djangoapps/contentstore/tests/test_i18n.py
@@ -184,7 +184,7 @@ def setUp(self):
 
         self.uname = 'testuser'
         self.email = 'test+courses@edx.org'
-        self.password = 'foo'
+        self.password = self.TEST_PASSWORD
 
         # Create the use so we can log them in.
         self.user = UserFactory.create(username=self.uname, email=self.email, password=self.password)
diff --git a/cms/djangoapps/contentstore/tests/test_users_default_role.py b/cms/djangoapps/contentstore/tests/test_users_default_role.py
index 590efc0bff67..1abf0a0ec697 100644
--- a/cms/djangoapps/contentstore/tests/test_users_default_role.py
+++ b/cms/djangoapps/contentstore/tests/test_users_default_role.py
@@ -27,7 +27,7 @@ def setUp(self):
         # create and log in a staff user.
         self.user = UserFactory(is_staff=True)
         self.client = AjaxEnabledTestClient()
-        self.client.login(username=self.user.username, password='test')
+        self.client.login(username=self.user.username, password=self.TEST_PASSWORD)
 
         # create a course via the view handler to create course
         self.course_key = self.store.make_course_key('Org_1', 'Course_1', 'Run_1')
diff --git a/cms/djangoapps/contentstore/tests/tests.py b/cms/djangoapps/contentstore/tests/tests.py
index f212bc39f1d8..bd2c3dbfd3c8 100644
--- a/cms/djangoapps/contentstore/tests/tests.py
+++ b/cms/djangoapps/contentstore/tests/tests.py
@@ -95,7 +95,7 @@ def setUp(self):
         super().setUp()
 
         self.email = 'a@b.com'
-        self.pw = 'xyz'
+        self.pw = 'password1234'
         self.username = 'testuser'
         self.client = AjaxEnabledTestClient()
         # clear the cache so ratelimiting won't affect these tests
diff --git a/cms/djangoapps/contentstore/toggles.py b/cms/djangoapps/contentstore/toggles.py
index a2a8055b5a6b..ac8469678f78 100644
--- a/cms/djangoapps/contentstore/toggles.py
+++ b/cms/djangoapps/contentstore/toggles.py
@@ -537,3 +537,21 @@ def default_enable_flexible_peer_openassessments(course_key):
     level to opt in/out of rolling forward this feature.
     """
     return DEFAULT_ENABLE_FLEXIBLE_PEER_OPENASSESSMENTS.is_enabled(course_key)
+
+
+# .. toggle_name: new_studio_mfe.use_tagging_taxonomy_list_page
+# .. toggle_implementation: WaffleFlag
+# .. toggle_default: False
+# .. toggle_description: This flag enables the use of the taxonomy list page.
+# .. toggle_use_cases: temporary
+# .. toggle_creation_date: 2023-10-06
+# .. toggle_target_removal_date: TBA
+# .. toggle_warning:
+ENABLE_TAGGING_TAXONOMY_LIST_PAGE = WaffleFlag('new_studio_mfe.use_tagging_taxonomy_list_page', __name__)
+
+
+def use_tagging_taxonomy_list_page():
+    """
+    Returns a boolean if taxonomy list page is enabled
+    """
+    return ENABLE_TAGGING_TAXONOMY_LIST_PAGE.is_enabled()
diff --git a/cms/djangoapps/contentstore/utils.py b/cms/djangoapps/contentstore/utils.py
index 1a4b709622e6..ba227ecbec0e 100644
--- a/cms/djangoapps/contentstore/utils.py
+++ b/cms/djangoapps/contentstore/utils.py
@@ -46,7 +46,6 @@
 )
 from common.djangoapps.xblock_django.user_service import DjangoXBlockUserService
 from openedx.core import toggles as core_toggles
-from openedx.core.djangoapps.course_apps.toggles import proctoring_settings_modal_view_enabled
 from openedx.core.djangoapps.credit.api import get_credit_requirements, is_credit_course
 from openedx.core.djangoapps.discussions.config.waffle import ENABLE_PAGES_AND_RESOURCES_MICROFRONTEND
 from openedx.core.djangoapps.discussions.models import DiscussionsConfiguration
@@ -76,6 +75,7 @@
     use_new_video_editor,
     use_new_video_uploads_page,
     use_new_custom_pages,
+    use_tagging_taxonomy_list_page,
 )
 from cms.djangoapps.models.settings.course_grading import CourseGradingModel
 from xmodule.library_tools import LibraryToolsService
@@ -245,10 +245,7 @@ def get_proctored_exam_settings_url(course_locator) -> str:
         mfe_base_url = get_course_authoring_url(course_locator)
         course_mfe_url = f'{mfe_base_url}/course/{course_locator}'
         if mfe_base_url:
-            if proctoring_settings_modal_view_enabled(course_locator):
-                proctored_exam_settings_url = f'{course_mfe_url}/pages-and-resources/proctoring/settings'
-            else:
-                proctored_exam_settings_url = f'{course_mfe_url}/proctored-exam-settings'
+            proctored_exam_settings_url = f'{course_mfe_url}/pages-and-resources/proctoring/settings'
     return proctored_exam_settings_url
 
 
@@ -433,6 +430,33 @@ def get_custom_pages_url(course_locator) -> str:
     return custom_pages_url
 
 
+def get_taxonomy_list_url():
+    """
+    Gets course authoring microfrontend URL for taxonomy list page view.
+    """
+    taxonomy_list_url = None
+    if use_tagging_taxonomy_list_page():
+        mfe_base_url = settings.COURSE_AUTHORING_MICROFRONTEND_URL
+        if mfe_base_url:
+            taxonomy_list_url = f'{mfe_base_url}/taxonomy-list'
+    return taxonomy_list_url
+
+
+def get_taxonomy_tags_widget_url(course_locator) -> str:
+    """
+    Gets course authoring microfrontend URL for taxonomy tags drawer widget view.
+
+    The `content_id` needs to be appended to the end of the URL when using it.
+    """
+    taxonomy_tags_widget_url = None
+    # Uses the same waffle flag as taxonomy list page
+    if use_tagging_taxonomy_list_page():
+        mfe_base_url = get_course_authoring_url(course_locator)
+        if mfe_base_url:
+            taxonomy_tags_widget_url = f'{mfe_base_url}/tagging/components/widget/'
+    return taxonomy_tags_widget_url
+
+
 def course_import_olx_validation_is_enabled():
     """
     Check if course olx validation is enabled on course import.
@@ -1514,8 +1538,10 @@ def format_in_process_course_view(uca):
         'archived_courses': archived_courses,
         'in_process_course_actions': in_process_course_actions,
         'libraries_enabled': LIBRARIES_ENABLED,
+        'taxonomies_enabled': use_tagging_taxonomy_list_page(),
         'redirect_to_library_authoring_mfe': should_redirect_to_library_authoring_mfe(),
         'library_authoring_mfe_url': LIBRARY_AUTHORING_MICROFRONTEND_URL,
+        'taxonomy_list_mfe_url': get_taxonomy_list_url(),
         'libraries': libraries,
         'show_new_library_button': user_can_create_library(user) and not should_redirect_to_library_authoring_mfe(),
         'user': user,
@@ -1553,6 +1579,92 @@ def get_course_rerun_context(course_key, course_block, user):
     return course_rerun_context
 
 
+def get_course_videos_context(course_block, pagination_conf, course_key=None):
+    """
+    Utils is used to get contest of course videos.
+    It is used for both DRF and django views.
+    """
+
+    from edx_toggles.toggles import WaffleSwitch
+    from edxval.api import (
+        get_3rd_party_transcription_plans,
+        get_transcript_credentials_state_for_org,
+        get_transcript_preferences,
+    )
+    from openedx.core.djangoapps.video_config.models import VideoTranscriptEnabledFlag
+    from xmodule.video_block.transcripts_utils import Transcript  # lint-amnesty, pylint: disable=wrong-import-order
+
+    from .video_storage_handlers import (
+        get_all_transcript_languages,
+        _get_index_videos,
+        _get_default_video_image_url
+    )
+
+    VIDEO_SUPPORTED_FILE_FORMATS = {
+        '.mp4': 'video/mp4',
+        '.mov': 'video/quicktime',
+    }
+    VIDEO_UPLOAD_MAX_FILE_SIZE_GB = 5
+    # Waffle switch for enabling/disabling video image upload feature
+    VIDEO_IMAGE_UPLOAD_ENABLED = WaffleSwitch(  # lint-amnesty, pylint: disable=toggle-missing-annotation
+        'videos.video_image_upload_enabled', __name__
+    )
+
+    course = course_block
+    if not course:
+        with modulestore().bulk_operations(course_key):
+            course = modulestore().get_course(course_key)
+
+    is_video_transcript_enabled = VideoTranscriptEnabledFlag.feature_enabled(course.id)
+    previous_uploads, pagination_context = _get_index_videos(course, pagination_conf)
+    course_video_context = {
+        'context_course': course,
+        'image_upload_url': reverse_course_url('video_images_handler', str(course.id)),
+        'video_handler_url': reverse_course_url('videos_handler', str(course.id)),
+        'encodings_download_url': reverse_course_url('video_encodings_download', str(course.id)),
+        'default_video_image_url': _get_default_video_image_url(),
+        'previous_uploads': previous_uploads,
+        'concurrent_upload_limit': settings.VIDEO_UPLOAD_PIPELINE.get('CONCURRENT_UPLOAD_LIMIT', 0),
+        'video_supported_file_formats': list(VIDEO_SUPPORTED_FILE_FORMATS.keys()),
+        'video_upload_max_file_size': VIDEO_UPLOAD_MAX_FILE_SIZE_GB,
+        'video_image_settings': {
+            'video_image_upload_enabled': VIDEO_IMAGE_UPLOAD_ENABLED.is_enabled(),
+            'max_size': settings.VIDEO_IMAGE_SETTINGS['VIDEO_IMAGE_MAX_BYTES'],
+            'min_size': settings.VIDEO_IMAGE_SETTINGS['VIDEO_IMAGE_MIN_BYTES'],
+            'max_width': settings.VIDEO_IMAGE_MAX_WIDTH,
+            'max_height': settings.VIDEO_IMAGE_MAX_HEIGHT,
+            'supported_file_formats': settings.VIDEO_IMAGE_SUPPORTED_FILE_FORMATS
+        },
+        'is_video_transcript_enabled': is_video_transcript_enabled,
+        'active_transcript_preferences': None,
+        'transcript_credentials': None,
+        'transcript_available_languages': get_all_transcript_languages(),
+        'video_transcript_settings': {
+            'transcript_download_handler_url': reverse('transcript_download_handler'),
+            'transcript_upload_handler_url': reverse('transcript_upload_handler'),
+            'transcript_delete_handler_url': reverse_course_url('transcript_delete_handler', str(course.id)),
+            'trancript_download_file_format': Transcript.SRT
+        },
+        'pagination_context': pagination_context
+    }
+    if is_video_transcript_enabled:
+        course_video_context['video_transcript_settings'].update({
+            'transcript_preferences_handler_url': reverse_course_url(
+                'transcript_preferences_handler',
+                str(course.id)
+            ),
+            'transcript_credentials_handler_url': reverse_course_url(
+                'transcript_credentials_handler',
+                str(course.id)
+            ),
+            'transcription_plans': get_3rd_party_transcription_plans(),
+        })
+        course_video_context['active_transcript_preferences'] = get_transcript_preferences(str(course.id))
+        # Cached state for transcript providers' credentials (org-specific)
+        course_video_context['transcript_credentials'] = get_transcript_credentials_state_for_org(course.id.org)
+    return course_video_context
+
+
 class StudioPermissionsService:
     """
     Service that can provide information about a user's permissions.
diff --git a/cms/djangoapps/contentstore/video_storage_handlers.py b/cms/djangoapps/contentstore/video_storage_handlers.py
index 6e83a5b9e3cc..318a91b4bb79 100644
--- a/cms/djangoapps/contentstore/video_storage_handlers.py
+++ b/cms/djangoapps/contentstore/video_storage_handlers.py
@@ -15,9 +15,9 @@
 from boto import s3
 from django.conf import settings
 from django.contrib.staticfiles.storage import staticfiles_storage
+from django.core.exceptions import PermissionDenied
 from django.http import FileResponse, HttpResponseNotFound
 from django.shortcuts import redirect
-from django.urls import reverse
 from django.utils.translation import gettext as _
 from django.utils.translation import gettext_noop
 from edx_toggles.toggles import WaffleSwitch
@@ -29,7 +29,6 @@
     get_3rd_party_transcription_plans,
     get_available_transcript_languages,
     get_video_transcript_url,
-    get_transcript_credentials_state_for_org,
     get_transcript_preferences,
     get_videos_for_course,
     remove_transcript_preferences,
@@ -43,6 +42,7 @@
 from rest_framework.response import Response
 
 from common.djangoapps.edxmako.shortcuts import render_to_response
+from common.djangoapps.student.auth import has_course_author_access
 from common.djangoapps.util.json_request import JsonResponse
 from openedx.core.djangoapps.video_config.models import VideoTranscriptEnabledFlag
 from openedx.core.djangoapps.video_config.toggles import PUBLIC_VIDEO_SHARE
@@ -51,11 +51,11 @@
     ENABLE_DEVSTACK_VIDEO_UPLOADS,
 )
 from openedx.core.djangoapps.waffle_utils import CourseWaffleFlag
-from xmodule.video_block.transcripts_utils import Transcript  # lint-amnesty, pylint: disable=wrong-import-order
+from xmodule.modulestore.django import modulestore  # lint-amnesty, pylint: disable=wrong-import-order
 
 from .models import VideoUploadConfig
 from .toggles import use_new_video_uploads_page, use_mock_video_uploads
-from .utils import reverse_course_url, get_video_uploads_url
+from .utils import get_video_uploads_url, get_course_videos_context
 from .video_utils import validate_video_image
 from .views.course import get_course_and_check_access
 
@@ -223,6 +223,33 @@ def handle_videos(request, course_key_string, edx_video_id=None):
         return JsonResponse(data, status=status)
 
 
+def get_video_usage_path(request, course_key, edx_video_id):
+    """
+    API for fetching the locations a specific video is used in a course.
+    Returns a list of paths to a video.
+    """
+    if not has_course_author_access(request.user, course_key):
+        raise PermissionDenied()
+    store = modulestore()
+    usage_locations = []
+    videos = store.get_items(
+        course_key,
+        qualifiers={
+            'category': 'video'
+        },
+    )
+    for video in videos:
+        video_id = getattr(video, 'edx_video_id', '')
+        if video_id == edx_video_id:
+            unit = video.get_parent()
+            subsection = unit.get_parent()
+            subsection_display_name = getattr(subsection, 'display_name', '')
+            unit_display_name = getattr(unit, 'display_name', '')
+            xblock_display_name = getattr(video, 'display_name', '')
+            usage_locations.append(f'{subsection_display_name} - {unit_display_name} / {xblock_display_name}')
+    return {'usage_locations': usage_locations}
+
+
 def handle_generate_video_upload_link(request, course_key_string):
     """
     API for creating a video upload.  Returns an edx_video_id and a presigned URL that can be used
@@ -585,7 +612,7 @@ def _get_index_videos(course, pagination_conf=None):
     course_id = str(course.id)
     attrs = [
         'edx_video_id', 'client_video_id', 'created', 'duration',
-        'status', 'courses', 'transcripts', 'transcription_status',
+        'status', 'courses', 'encoded_videos', 'transcripts', 'transcription_status',
         'transcript_urls', 'error_description'
     ]
 
@@ -598,9 +625,15 @@ def _get_values(video):
             if attr == 'courses':
                 course = [c for c in video['courses'] if course_id in c]
                 (__, values['course_video_image_url']), = list(course[0].items())
+            elif attr == 'encoded_videos':
+                values['download_link'] = ''
+                values['file_size'] = 0
+                for encoding in video['encoded_videos']:
+                    if encoding['profile'] == 'desktop_mp4':
+                        values['download_link'] = encoding['url']
+                        values['file_size'] = encoding['file_size']
             else:
                 values[attr] = video[attr]
-
         return values
 
     videos, pagination_context = _get_videos(course, pagination_conf)
@@ -636,54 +669,10 @@ def videos_index_html(course, pagination_conf=None):
     """
     Returns an HTML page to display previous video uploads and allow new ones
     """
-    is_video_transcript_enabled = VideoTranscriptEnabledFlag.feature_enabled(course.id)
-    previous_uploads, pagination_context = _get_index_videos(course, pagination_conf)
-    context = {
-        'context_course': course,
-        'image_upload_url': reverse_course_url('video_images_handler', str(course.id)),
-        'video_handler_url': reverse_course_url('videos_handler', str(course.id)),
-        'encodings_download_url': reverse_course_url('video_encodings_download', str(course.id)),
-        'default_video_image_url': _get_default_video_image_url(),
-        'previous_uploads': previous_uploads,
-        'concurrent_upload_limit': settings.VIDEO_UPLOAD_PIPELINE.get('CONCURRENT_UPLOAD_LIMIT', 0),
-        'video_supported_file_formats': list(VIDEO_SUPPORTED_FILE_FORMATS.keys()),
-        'video_upload_max_file_size': VIDEO_UPLOAD_MAX_FILE_SIZE_GB,
-        'video_image_settings': {
-            'video_image_upload_enabled': VIDEO_IMAGE_UPLOAD_ENABLED.is_enabled(),
-            'max_size': settings.VIDEO_IMAGE_SETTINGS['VIDEO_IMAGE_MAX_BYTES'],
-            'min_size': settings.VIDEO_IMAGE_SETTINGS['VIDEO_IMAGE_MIN_BYTES'],
-            'max_width': settings.VIDEO_IMAGE_MAX_WIDTH,
-            'max_height': settings.VIDEO_IMAGE_MAX_HEIGHT,
-            'supported_file_formats': settings.VIDEO_IMAGE_SUPPORTED_FILE_FORMATS
-        },
-        'is_video_transcript_enabled': is_video_transcript_enabled,
-        'active_transcript_preferences': None,
-        'transcript_credentials': None,
-        'transcript_available_languages': get_all_transcript_languages(),
-        'video_transcript_settings': {
-            'transcript_download_handler_url': reverse('transcript_download_handler'),
-            'transcript_upload_handler_url': reverse('transcript_upload_handler'),
-            'transcript_delete_handler_url': reverse_course_url('transcript_delete_handler', str(course.id)),
-            'trancript_download_file_format': Transcript.SRT
-        },
-        'pagination_context': pagination_context
-    }
-
-    if is_video_transcript_enabled:
-        context['video_transcript_settings'].update({
-            'transcript_preferences_handler_url': reverse_course_url(
-                'transcript_preferences_handler',
-                str(course.id)
-            ),
-            'transcript_credentials_handler_url': reverse_course_url(
-                'transcript_credentials_handler',
-                str(course.id)
-            ),
-            'transcription_plans': get_3rd_party_transcription_plans(),
-        })
-        context['active_transcript_preferences'] = get_transcript_preferences(str(course.id))
-        # Cached state for transcript providers' credentials (org-specific)
-        context['transcript_credentials'] = get_transcript_credentials_state_for_org(course.id.org)
+    context = get_course_videos_context(
+        course,
+        pagination_conf,
+    )
     if use_new_video_uploads_page(course.id):
         return redirect(get_video_uploads_url(course.id))
     return render_to_response('videos_index.html', context)
diff --git a/cms/djangoapps/contentstore/views/course.py b/cms/djangoapps/contentstore/views/course.py
index a55bb3db9a53..b42c011c4b20 100644
--- a/cms/djangoapps/contentstore/views/course.py
+++ b/cms/djangoapps/contentstore/views/course.py
@@ -105,6 +105,7 @@
     get_lms_link_for_item,
     get_proctored_exam_settings_url,
     get_course_outline_url,
+    get_taxonomy_tags_widget_url,
     get_studio_home_url,
     get_updates_url,
     get_advanced_settings_url,
@@ -688,6 +689,7 @@ def course_index(request, course_key):
             'mfe_proctored_exam_settings_url': get_proctored_exam_settings_url(course_block.id),
             'advance_settings_url': reverse_course_url('advanced_settings_handler', course_block.id),
             'proctoring_errors': proctoring_errors,
+            'taxonomy_tags_widget_url': get_taxonomy_tags_widget_url(course_block.id),
         })
 
 
diff --git a/cms/djangoapps/contentstore/views/tests/test_assets.py b/cms/djangoapps/contentstore/views/tests/test_assets.py
index 2484f3d826fb..914f660f61d3 100644
--- a/cms/djangoapps/contentstore/views/tests/test_assets.py
+++ b/cms/djangoapps/contentstore/views/tests/test_assets.py
@@ -175,6 +175,9 @@ def test_json_responses(self):
         self.assert_correct_asset_response(self.url + "?page_size=2", 0, 2, 4)
         self.assert_correct_asset_response(
             self.url + "?page_size=2&page=1", 2, 2, 4)
+        self.assert_correct_asset_response(self.url + '?display_name=asset-1.txt', 0, 1, 1)
+        self.assert_correct_asset_response(self.url + '?display_name=asset-1.txt&display_name=asset-2.txt', 0, 2, 2)
+        self.assert_correct_asset_response(self.url + '?display_name=asset-1.txt&display_name=asset-0.txt', 0, 1, 1)
         self.assert_correct_sort_response(self.url, 'date_added', 'asc')
         self.assert_correct_sort_response(self.url, 'date_added', 'desc')
         self.assert_correct_sort_response(self.url, 'display_name', 'asc')
diff --git a/cms/djangoapps/contentstore/views/tests/test_certificates.py b/cms/djangoapps/contentstore/views/tests/test_certificates.py
index 76dfb3be95d7..7af7a448de10 100644
--- a/cms/djangoapps/contentstore/views/tests/test_certificates.py
+++ b/cms/djangoapps/contentstore/views/tests/test_certificates.py
@@ -249,7 +249,7 @@ def test_cannot_create_certificate_if_user_has_no_write_permissions(self):
         Tests user without write permissions on course should not able to create certificate
         """
         user = UserFactory()
-        self.client.login(username=user.username, password='test')
+        self.client.login(username=user.username, password=self.TEST_PASSWORD)
         response = self.client.ajax_post(
             self._url(),
             data=CERTIFICATE_JSON
@@ -635,7 +635,7 @@ def test_delete_certificate_without_write_permissions(self, signatory_path):
         """
         self._add_course_certificates(count=2, signatory_count=1, asset_path_format=signatory_path)
         user = UserFactory()
-        self.client.login(username=user.username, password='test')
+        self.client.login(username=user.username, password=self.TEST_PASSWORD)
         response = self.client.delete(
             self._url(cid=1),
             content_type="application/json",
@@ -653,7 +653,7 @@ def test_delete_certificate_without_global_staff_permissions(self, signatory_pat
         user = UserFactory()
         for role in [CourseInstructorRole, CourseStaffRole]:
             role(self.course.id).add_users(user)
-        self.client.login(username=user.username, password='test')
+        self.client.login(username=user.username, password=self.TEST_PASSWORD)
         response = self.client.delete(
             self._url(cid=1),
             content_type="application/json",
@@ -681,7 +681,7 @@ def test_update_active_certificate_without_global_staff_permissions(self, signat
         user = UserFactory()
         for role in [CourseInstructorRole, CourseStaffRole]:
             role(self.course.id).add_users(user)
-        self.client.login(username=user.username, password='test')
+        self.client.login(username=user.username, password=self.TEST_PASSWORD)
         response = self.client.put(
             self._url(cid=1),
             data=json.dumps(cert_data),
@@ -799,7 +799,7 @@ def test_certificate_activation_without_write_permissions(self, activate, signat
         test_url = reverse_course_url('certificate_activation_handler', self.course.id)
         self._add_course_certificates(count=1, signatory_count=2, asset_path_format=signatory_path)
         user = UserFactory()
-        self.client.login(username=user.username, password='test')
+        self.client.login(username=user.username, password=self.TEST_PASSWORD)
         response = self.client.post(
             test_url,
             data=json.dumps({"is_active": activate}),
diff --git a/cms/djangoapps/contentstore/views/tests/test_organizations.py b/cms/djangoapps/contentstore/views/tests/test_organizations.py
index 6f3b67671101..cf3a376f3461 100644
--- a/cms/djangoapps/contentstore/views/tests/test_organizations.py
+++ b/cms/djangoapps/contentstore/views/tests/test_organizations.py
@@ -14,8 +14,9 @@ class TestOrganizationListing(TestCase):
     """Verify Organization listing behavior."""
     def setUp(self):
         super().setUp()
-        self.staff = UserFactory(is_staff=True)
-        self.client.login(username=self.staff.username, password='test')
+        self.password = "password1234"
+        self.staff = UserFactory(is_staff=True, password=self.password)
+        self.client.login(username=self.staff.username, password=self.password)
         self.org_names_listing_url = reverse('organizations')
         self.org_short_names = ["alphaX", "betaX", "orgX"]
         for index, short_name in enumerate(self.org_short_names):
diff --git a/cms/djangoapps/contentstore/views/tests/test_videos.py b/cms/djangoapps/contentstore/views/tests/test_videos.py
index c0f48073ad74..7d2f6e36e524 100644
--- a/cms/djangoapps/contentstore/views/tests/test_videos.py
+++ b/cms/djangoapps/contentstore/views/tests/test_videos.py
@@ -358,6 +358,7 @@ def test_get_json(self):
         for i, response_video in enumerate(response_videos):
             # Videos should be returned by creation date descending
             original_video = self.previous_uploads[-(i + 1)]
+            print(response_video.keys())
             self.assertEqual(
                 set(response_video.keys()),
                 {
@@ -367,6 +368,8 @@ def test_get_json(self):
                     'duration',
                     'status',
                     'course_video_image_url',
+                    'file_size',
+                    'download_link',
                     'transcripts',
                     'transcription_status',
                     'transcript_urls',
@@ -385,8 +388,8 @@ def test_get_json(self):
         (
             [
                 'edx_video_id', 'client_video_id', 'created', 'duration',
-                'status', 'course_video_image_url', 'transcripts', 'transcription_status',
-                'transcript_urls', 'error_description'
+                'status', 'course_video_image_url', 'file_size', 'download_link',
+                'transcripts', 'transcription_status', 'transcript_urls', 'error_description'
             ],
             [
                 {
@@ -402,8 +405,8 @@ def test_get_json(self):
         (
             [
                 'edx_video_id', 'client_video_id', 'created', 'duration',
-                'status', 'course_video_image_url', 'transcripts', 'transcription_status',
-                'transcript_urls', 'error_description'
+                'status', 'course_video_image_url', 'file_size', 'download_link',
+                'transcripts', 'transcription_status', 'transcript_urls', 'error_description'
             ],
             [
                 {
@@ -444,8 +447,9 @@ def test_get_json_transcripts(self, expected_video_keys, uploaded_transcripts, e
         self.assertEqual(response.status_code, 200)
         response_videos = json.loads(response.content.decode('utf-8'))['videos']
         self.assertEqual(len(response_videos), len(self.previous_uploads))
-
         for response_video in response_videos:
+            print(response_video)
+
             self.assertEqual(set(response_video.keys()), set(expected_video_keys))
             if response_video['edx_video_id'] == self.previous_uploads[0]['edx_video_id']:
                 self.assertEqual(response_video.get('transcripts', []), expected_transcripts)
diff --git a/cms/djangoapps/contentstore/xblock_storage_handlers/view_handlers.py b/cms/djangoapps/contentstore/xblock_storage_handlers/view_handlers.py
index 425f97e3751f..4ed0073befc5 100644
--- a/cms/djangoapps/contentstore/xblock_storage_handlers/view_handlers.py
+++ b/cms/djangoapps/contentstore/xblock_storage_handlers/view_handlers.py
@@ -38,7 +38,7 @@
 from xblock.fields import Scope
 
 from cms.djangoapps.contentstore.config.waffle import SHOW_REVIEW_RULES_FLAG
-from cms.djangoapps.contentstore.toggles import ENABLE_COPY_PASTE_UNITS
+from cms.djangoapps.contentstore.toggles import ENABLE_COPY_PASTE_UNITS, use_tagging_taxonomy_list_page
 from cms.djangoapps.models.settings.course_grading import CourseGradingModel
 from cms.lib.ai_aside_summary_config import AiAsideSummaryConfig
 from common.djangoapps.edxmako.services import MakoService
@@ -1397,6 +1397,10 @@ def create_xblock_info(  # lint-amnesty, pylint: disable=too-many-statements
             # If the ENABLE_COPY_PASTE_UNITS feature flag is enabled, we show the newer menu that allows copying/pasting
             xblock_info["enable_copy_paste_units"] = ENABLE_COPY_PASTE_UNITS.is_enabled()
 
+            # If the ENABLE_TAGGING_TAXONOMY_LIST_PAGE feature flag is enabled, we show the "Manage Tags" options
+            if use_tagging_taxonomy_list_page():
+                xblock_info["use_tagging_taxonomy_list_page"] = True
+
             xblock_info[
                 "has_partition_group_components"
             ] = has_children_visible_to_specific_partition_groups(xblock)
diff --git a/cms/djangoapps/maintenance/tests.py b/cms/djangoapps/maintenance/tests.py
index dd060c4c0113..a487f8e37faa 100644
--- a/cms/djangoapps/maintenance/tests.py
+++ b/cms/djangoapps/maintenance/tests.py
@@ -30,7 +30,7 @@ class TestMaintenanceIndex(ModuleStoreTestCase):
     def setUp(self):
         super().setUp()
         self.user = AdminFactory()
-        login_success = self.client.login(username=self.user.username, password='test')
+        login_success = self.client.login(username=self.user.username, password=self.TEST_PASSWORD)
         self.assertTrue(login_success)
         self.view_url = reverse('maintenance:maintenance_index')
 
@@ -56,7 +56,7 @@ class MaintenanceViewTestCase(ModuleStoreTestCase):
     def setUp(self):
         super().setUp()
         self.user = AdminFactory()
-        login_success = self.client.login(username=self.user.username, password='test')
+        login_success = self.client.login(username=self.user.username, password=self.TEST_PASSWORD)
         self.assertTrue(login_success)
 
     def verify_error_message(self, data, error_message):
@@ -110,8 +110,8 @@ def test_non_global_staff_access(self, url):
         """
         Test that all maintenance app views are not accessible to non-global-staff user.
         """
-        user = UserFactory(username='test', email='test@example.com', password='test')
-        login_success = self.client.login(username=user.username, password='test')
+        user = UserFactory(username='test', email='test@example.com', password=self.TEST_PASSWORD)
+        login_success = self.client.login(username=user.username, password=self.TEST_PASSWORD)
         self.assertTrue(login_success)
 
         response = self.client.get(url)
@@ -245,13 +245,13 @@ def setUp(self):
         self.admin = AdminFactory.create(
             email='staff@edx.org',
             username='admin',
-            password='pass'
+            password=self.TEST_PASSWORD
         )
-        self.client.login(username=self.admin.username, password='pass')
+        self.client.login(username=self.admin.username, password=self.TEST_PASSWORD)
         self.non_staff_user = UserFactory.create(
             email='test@edx.org',
             username='test',
-            password='pass'
+            password=self.TEST_PASSWORD
         )
 
     def test_index(self):
@@ -301,7 +301,7 @@ def _test_403(self, viewname, kwargs=None):
         self.assertEqual(response.status_code, 403)
 
     def test_authorization(self):
-        self.client.login(username=self.non_staff_user, password='pass')
+        self.client.login(username=self.non_staff_user, password=self.TEST_PASSWORD)
         announcement = Announcement.objects.create(content="Test Delete")
         announcement.save()
 
diff --git a/cms/djangoapps/models/settings/course_metadata.py b/cms/djangoapps/models/settings/course_metadata.py
index f45130d9fa76..e5a0ab6a5b8f 100644
--- a/cms/djangoapps/models/settings/course_metadata.py
+++ b/cms/djangoapps/models/settings/course_metadata.py
@@ -126,11 +126,6 @@ def get_exclude_list_of_fields(cls, course_key):
             exclude_list.append('enable_ccx')
             exclude_list.append('ccx_connector')
 
-        # Do not show "Issue Open Badges" in Studio Advanced Settings
-        # if the feature is disabled.
-        if not settings.FEATURES.get('ENABLE_OPENBADGES'):
-            exclude_list.append('issue_badges')
-
         # If the XBlockStudioConfiguration table is not being used, there is no need to
         # display the "Allow Unsupported XBlocks" setting.
         if not XBlockStudioConfigurationFlag.is_enabled():
diff --git a/cms/envs/bok_choy.auth.json b/cms/envs/bok_choy.auth.json
deleted file mode 100644
index db92b5ba924e..000000000000
--- a/cms/envs/bok_choy.auth.json
+++ /dev/null
@@ -1,116 +0,0 @@
-{
-    "AWS_ACCESS_KEY_ID": "",
-    "AWS_SECRET_ACCESS_KEY": "",
-    "CELERY_BROKER_PASSWORD": "celery",
-    "CELERY_BROKER_USER": "celery",
-    "CONTENTSTORE": {
-        "DOC_STORE_CONFIG": {
-            "collection": "modulestore",
-            "db": "test",
-            "host": [
-                "localhost"
-            ],
-            "port": 27017
-        },
-        "ENGINE": "xmodule.contentstore.mongo.MongoContentStore",
-        "OPTIONS": {
-            "db": "test",
-            "host": [
-                "localhost"
-            ],
-            "port": 27017
-        }
-    },
-    "DATABASES": {
-        "default": {
-            "ENGINE": "django.db.backends.mysql",
-            "HOST": "localhost",
-            "NAME": "edxtest",
-            "PASSWORD": "",
-            "PORT": "3306",
-            "USER": "root"
-        },
-        "student_module_history": {
-            "ENGINE": "django.db.backends.mysql",
-            "HOST": "localhost",
-            "NAME": "student_module_history_test",
-            "PASSWORD": "",
-            "PORT": "3306",
-            "USER": "root"
-        }
-    },
-    "DOC_STORE_CONFIG": {
-        "collection": "modulestore",
-        "db": "test",
-        "host": [
-            "localhost"
-        ],
-        "port": 27017
-    },
-    "JWT_AUTH": {
-        "JWT_SECRET_KEY": "super-secret-key",
-        "JWT_PUBLIC_SIGNING_JWK_SET": "{\"keys\": [{\"kid\": \"BTZ9HA6K\", \"e\": \"AQAB\", \"kty\": \"RSA\", \"n\": \"o5cn3ljSRi6FaDEKTn0PS-oL9EFyv1pI7dRgffQLD1qf5D6sprmYfWWokSsrWig8u2y0HChSygR6Jn5KXBqQn6FpM0dDJLnWQDRXHLl3Ey1iPYgDSmOIsIGrV9ZyNCQwk03wAgWbfdBTig3QSDYD-sTNOs3pc4UD_PqAvU2nz_1SS2ZiOwOn5F6gulE1L0iE3KEUEvOIagfHNVhz0oxa_VRZILkzV-zr6R_TW1m97h4H8jXl_VJyQGyhMGGypuDrQ9_vaY_RLEulLCyY0INglHWQ7pckxBtI5q55-Vio2wgewe2_qYcGsnBGaDNbySAsvYcWRrqDiFyzrJYivodqTQ\"}]}"
-    },
-    "MODULESTORE": {
-        "default": {
-            "ENGINE": "xmodule.modulestore.mixed.MixedModuleStore",
-            "OPTIONS": {
-                "mappings": {},
-                "stores": [
-                    {
-                        "NAME": "draft",
-                        "DOC_STORE_CONFIG": {
-                            "collection": "modulestore",
-                            "db": "test",
-                            "host": [
-                                "localhost"
-                            ],
-                            "port": 27017
-                        },
-                        "ENGINE": "xmodule.modulestore.mongo.DraftMongoModuleStore",
-                        "OPTIONS": {
-                            "collection": "modulestore",
-                            "db": "test",
-                            "default_class": "xmodule.hidden_block.HiddenBlock",
-                            "fs_root": "** OVERRIDDEN **",
-                            "host": [
-                                "localhost"
-                            ],
-                            "port": 27017,
-                            "render_template": "common.djangoapps.edxmako.shortcuts.render_to_string"
-                        }
-                    },
-                    {
-                        "NAME": "xml",
-                        "ENGINE": "xmodule.modulestore.xml.XMLModuleStore",
-                        "OPTIONS": {
-                            "data_dir": "** OVERRIDDEN **",
-                            "default_class": "xmodule.hidden_block.HiddenBlock"
-                        }
-                    }
-                ]
-            }
-        }
-    },
-    "DJFS": {
-            "type": "s3fs",
-            "bucket": "test",
-            "prefix": "test",
-            "aws_access_key_id": "test",
-            "aws_secret_access_key": "test"
-    },
-    "SECRET_KEY": "",
-    "XQUEUE_INTERFACE": {
-        "basic_auth": [
-            "edx",
-            "edx"
-        ],
-        "django_auth": {
-            "password": "password",
-            "username": "lms"
-        },
-        "url": "http://localhost:18040"
-    },
-    "ZENDESK_API_KEY": "",
-    "ZENDESK_USER": ""
-}
diff --git a/cms/envs/bok_choy.env.json b/cms/envs/bok_choy.env.json
deleted file mode 100644
index 6343dc048c69..000000000000
--- a/cms/envs/bok_choy.env.json
+++ /dev/null
@@ -1,127 +0,0 @@
-{
-    "BUGS_EMAIL": "bugs@example.com",
-    "BULK_EMAIL_DEFAULT_FROM_EMAIL": "no-reply@example.com",
-    "CACHES": {
-        "celery": {
-            "BACKEND": "django.core.cache.backends.memcached.PyMemcacheCache",
-            "OPTIONS": {
-                "no_delay": true,
-                "ignore_exc": true,
-                "use_pooling": true
-            },
-            "KEY_FUNCTION": "common.djangoapps.util.memcache.safe_key",
-            "KEY_PREFIX": "integration_celery",
-            "LOCATION": [
-                "localhost:11211"
-            ]
-        },
-        "default": {
-            "BACKEND": "django.core.cache.backends.memcached.PyMemcacheCache",
-            "OPTIONS": {
-                "no_delay": true,
-                "ignore_exc": true,
-                "use_pooling": true
-            },
-            "KEY_FUNCTION": "common.djangoapps.util.memcache.safe_key",
-            "KEY_PREFIX": "sandbox_default",
-            "LOCATION": [
-                "localhost:11211"
-            ]
-        },
-        "general": {
-            "BACKEND": "django.core.cache.backends.memcached.PyMemcacheCache",
-            "OPTIONS": {
-                "no_delay": true,
-                "ignore_exc": true,
-                "use_pooling": true
-            },
-            "KEY_FUNCTION": "common.djangoapps.util.memcache.safe_key",
-            "KEY_PREFIX": "sandbox_general",
-            "LOCATION": [
-                "localhost:11211"
-            ]
-        },
-        "mongo_metadata_inheritance": {
-            "BACKEND": "django.core.cache.backends.memcached.PyMemcacheCache",
-            "OPTIONS": {
-                "no_delay": true,
-                "ignore_exc": true,
-                "use_pooling": true
-            },
-            "KEY_FUNCTION": "common.djangoapps.util.memcache.safe_key",
-            "KEY_PREFIX": "integration_mongo_metadata_inheritance",
-            "LOCATION": [
-                "localhost:11211"
-            ]
-        },
-        "staticfiles": {
-            "BACKEND": "django.core.cache.backends.memcached.PyMemcacheCache",
-            "OPTIONS": {
-                "no_delay": true,
-                "ignore_exc": true,
-                "use_pooling": true
-            },
-            "KEY_FUNCTION": "common.djangoapps.util.memcache.safe_key",
-            "KEY_PREFIX": "integration_static_files",
-            "LOCATION": [
-                "localhost:11211"
-            ]
-        }
-    },
-    "CELERY_ALWAYS_EAGER": true,
-    "CELERY_BROKER_HOSTNAME": "localhost",
-    "CELERY_BROKER_TRANSPORT": "amqp",
-    "CERT_QUEUE": "certificates",
-    "CLEAR_REQUEST_CACHE_ON_TASK_COMPLETION": false,
-    "CMS_BASE": "localhost:8031",
-    "CODE_JAIL": {
-        "limits": {
-            "REALTIME": 3,
-            "VMEM": 0
-        }
-    },
-    "COMMENTS_SERVICE_KEY": "password",
-    "COMMENTS_SERVICE_URL": "http://localhost:4567",
-    "CONTACT_EMAIL": "info@example.com",
-    "DEFAULT_FEEDBACK_EMAIL": "feedback@example.com",
-    "DEFAULT_FROM_EMAIL": "registration@example.com",
-    "EMAIL_BACKEND": "django.core.mail.backends.smtp.EmailBackend",
-    "SOCIAL_SHARING_SETTINGS": {
-        "CUSTOM_COURSE_URLS": true
-    },
-    "FEATURES": {
-        "CERTIFICATES_HTML_VIEW": true,
-        "ENABLE_DISCUSSION_SERVICE": true,
-        "ENABLE_GRADE_DOWNLOADS": true,
-        "ENTRANCE_EXAMS": true,
-        "MILESTONES_APP": true,
-        "PREVIEW_LMS_BASE": "preview.localhost:8003",
-        "ENABLE_CONTENT_LIBRARIES": true,
-        "ENABLE_SPECIAL_EXAMS": true,
-        "SHOW_HEADER_LANGUAGE_SELECTOR": true,
-        "ENABLE_EXTENDED_COURSE_DETAILS": true,
-        "CUSTOM_COURSES_EDX": true
-    },
-    "FEEDBACK_SUBMISSION_EMAIL": "",
-    "GITHUB_REPO_ROOT": "** OVERRIDDEN **",
-    "GRADES_DOWNLOAD": {
-        "BUCKET": "edx-grades",
-        "ROOT_PATH": "/tmp/edx-s3/grades",
-        "STORAGE_TYPE": "localfs"
-    },
-    "LMS_BASE": "localhost:8003",
-    "LMS_ROOT_URL": "http://localhost:8003",
-    "LOCAL_LOGLEVEL": "INFO",
-    "LOGGING_ENV": "sandbox",
-    "LOG_DIR": "** OVERRIDDEN **",
-    "MEDIA_URL": "/media/",
-    "MKTG_URL_LINK_MAP": {},
-    "SERVER_EMAIL": "devops@example.com",
-    "SESSION_COOKIE_DOMAIN": null,
-    "SITE_NAME": "localhost",
-    "STATIC_URL_BASE": "/static/",
-    "SYSLOG_SERVER": "",
-    "TECH_SUPPORT_EMAIL": "technical@example.com",
-    "TIME_ZONE": "America/New_York",
-    "WIKI_ENABLED": true,
-}
diff --git a/cms/envs/bok_choy.py b/cms/envs/bok_choy.py
deleted file mode 100644
index f96183840c71..000000000000
--- a/cms/envs/bok_choy.py
+++ /dev/null
@@ -1,184 +0,0 @@
-"""
-Settings for Bok Choy tests that are used when running Studio.
-
-Bok Choy uses two different settings files:
-1. test_static_optimized is used when invoking collectstatic
-2. bok_choy is used when running the tests
-
-Note: it isn't possible to have a single settings file, because Django doesn't
-support both generating static assets to a directory and also serving static
-from the same directory.
-"""
-
-
-# Silence noisy logs
-import logging
-import os
-
-from django.utils.translation import gettext_lazy
-from path import Path as path
-
-from openedx.core.release import RELEASE_LINE
-from xmodule.modulestore.modulestore_settings import update_module_store_settings  # lint-amnesty, pylint: disable=wrong-import-order
-
-########################## Prod-like settings ###################################
-# These should be as close as possible to the settings we use in production.
-# As in prod, we read in environment and auth variables from JSON files.
-# Unlike in prod, we use the JSON files stored in this repo.
-# This is a convenience for ensuring (a) that we can consistently find the files
-# and (b) that the files are the same in Jenkins as in local dev.
-os.environ['SERVICE_VARIANT'] = 'bok_choy_docker' if 'BOK_CHOY_HOSTNAME' in os.environ else 'bok_choy'
-CONFIG_ROOT = path(__file__).abspath().dirname()
-os.environ['STUDIO_CFG'] = str.format("{config_root}/{service_variant}.yml",
-                                      config_root=CONFIG_ROOT,
-                                      service_variant=os.environ['SERVICE_VARIANT'])
-os.environ['REVISION_CFG'] = f"{CONFIG_ROOT}/revisions.yml"
-
-from .production import *  # pylint: disable=wildcard-import, unused-wildcard-import, wrong-import-position
-
-
-######################### Testing overrides ####################################
-
-# Redirect to the test_root folder within the repo
-TEST_ROOT = REPO_ROOT / "test_root"
-GITHUB_REPO_ROOT = (TEST_ROOT / "data").abspath()
-LOG_DIR = (TEST_ROOT / "log").abspath()
-DATA_DIR = TEST_ROOT / "data"
-
-# Configure modulestore to use the test folder within the repo
-update_module_store_settings(
-    MODULESTORE,
-    module_store_options={
-        'fs_root': (TEST_ROOT / "data").abspath(),
-    },
-    xml_store_options={
-        'data_dir': (TEST_ROOT / "data").abspath(),
-    },
-    default_store=os.environ.get('DEFAULT_STORE', 'draft'),
-)
-
-# Needed to enable licensing on video blocks
-XBLOCK_SETTINGS.update({'VideoBlock': {'licensing_enabled': True}})
-
-# Capture the console log via template includes, until webdriver supports log capture again
-CAPTURE_CONSOLE_LOG = True
-
-PLATFORM_NAME = gettext_lazy("édX")
-PLATFORM_DESCRIPTION = gettext_lazy("Open édX Platform")
-STUDIO_NAME = gettext_lazy("Your Platform 𝓢𝓽𝓾𝓭𝓲𝓸")
-STUDIO_SHORT_NAME = gettext_lazy("𝓢𝓽𝓾𝓭𝓲𝓸")
-
-############################ STATIC FILES #############################
-
-# Enable debug so that static assets are served by Django
-DEBUG = True
-
-# Serve static files at /static directly from the staticfiles directory under test root
-# Note: optimized files for testing are generated with settings from test_static_optimized
-STATIC_URL = "/static/"
-STATICFILES_FINDERS = [
-    'django.contrib.staticfiles.finders.FileSystemFinder',
-]
-STATICFILES_DIRS = [
-    (TEST_ROOT / "staticfiles" / "cms").abspath(),
-]
-
-DEFAULT_FILE_STORAGE = 'django.core.files.storage.FileSystemStorage'
-MEDIA_ROOT = TEST_ROOT / "uploads"
-
-WEBPACK_LOADER['DEFAULT']['STATS_FILE'] = TEST_ROOT / "staticfiles" / "cms" / "webpack-stats.json"
-
-LOG_OVERRIDES = [
-    ('common.djangoapps.track.middleware', logging.CRITICAL),
-    ('edx.discussion', logging.CRITICAL),
-]
-for log_name, log_level in LOG_OVERRIDES:
-    logging.getLogger(log_name).setLevel(log_level)
-
-# Use the auto_auth workflow for creating users and logging them in
-FEATURES['AUTOMATIC_AUTH_FOR_TESTING'] = True
-FEATURES['RESTRICT_AUTOMATIC_AUTH'] = False
-
-# Enable milestones app
-FEATURES['MILESTONES_APP'] = True
-
-# Enable pre-requisite course
-FEATURES['ENABLE_PREREQUISITE_COURSES'] = True
-
-# Enable student notes
-FEATURES['ENABLE_EDXNOTES'] = True
-
-# Enable teams feature
-FEATURES['ENABLE_TEAMS'] = True
-
-# Enable custom content licensing
-FEATURES['LICENSING'] = True
-
-FEATURES['ENABLE_MOBILE_REST_API'] = True  # Enable video bumper in Studio
-FEATURES['ENABLE_VIDEO_BUMPER'] = True  # Enable video bumper in Studio settings
-
-FEATURES['ENABLE_ENROLLMENT_TRACK_USER_PARTITION'] = True
-
-# Whether archived courses (courses with end dates in the past) should be
-# shown in Studio in a separate list.
-FEATURES['ENABLE_SEPARATE_ARCHIVED_COURSES'] = True
-
-# Enable support for OpenBadges accomplishments
-FEATURES['ENABLE_OPENBADGES'] = True
-
-# Enable partner support link in Studio footer
-PARTNER_SUPPORT_EMAIL = 'partner-support@example.com'
-
-########################### Entrance Exams #################################
-FEATURES['ENTRANCE_EXAMS'] = True
-
-FEATURES['ENABLE_SPECIAL_EXAMS'] = True
-
-# Point the URL used to test YouTube availability to our stub YouTube server
-YOUTUBE_PORT = 9080
-YOUTUBE['TEST_TIMEOUT'] = 5000
-YOUTUBE_HOSTNAME = os.environ.get('BOK_CHOY_HOSTNAME', '127.0.0.1')
-YOUTUBE['API'] = f"http://{YOUTUBE_HOSTNAME}:{YOUTUBE_PORT}/get_youtube_api/"
-YOUTUBE['METADATA_URL'] = f"http://{YOUTUBE_HOSTNAME}:{YOUTUBE_PORT}/test_youtube/"
-
-FEATURES['ENABLE_COURSEWARE_INDEX'] = True
-FEATURES['ENABLE_LIBRARY_INDEX'] = True
-FEATURES['ENABLE_CONTENT_LIBRARY_INDEX'] = False
-
-ORGANIZATIONS_AUTOCREATE = False
-
-SEARCH_ENGINE = "search.tests.mock_search_engine.MockSearchEngine"
-# Path at which to store the mock index
-MOCK_SEARCH_BACKING_FILE = (
-    TEST_ROOT / "index_file.dat"
-).abspath()
-
-# this secret key should be the same as lms/envs/bok_choy.py's
-SECRET_KEY = "very_secret_bok_choy_key"
-
-LMS_ROOT_URL = "http://localhost:8003"
-if RELEASE_LINE == "master":
-    # On master, acceptance tests use edX books, not the default Open edX books.
-    HELP_TOKENS_BOOKS = {
-        'learner': 'https://edx.readthedocs.io/projects/edx-guide-for-students',
-        'course_author': 'https://edx.readthedocs.io/projects/edx-partner-course-staff',
-    }
-
-########################## VIDEO TRANSCRIPTS STORAGE ############################
-VIDEO_TRANSCRIPTS_SETTINGS = dict(
-    VIDEO_TRANSCRIPTS_MAX_BYTES=3 * 1024 * 1024,    # 3 MB
-    STORAGE_KWARGS=dict(
-        location=MEDIA_ROOT,
-        base_url=MEDIA_URL,
-    ),
-    DIRECTORY_PREFIX='video-transcripts/',
-)
-
-INSTALLED_APPS.append('openedx.testing.coverage_context_listener')
-
-#####################################################################
-# Lastly, see if the developer has any local overrides.
-try:
-    from .private import *      # pylint: disable=wildcard-import
-except ImportError:
-    pass
diff --git a/cms/envs/bok_choy.yml b/cms/envs/bok_choy.yml
deleted file mode 100644
index 03bd022414b4..000000000000
--- a/cms/envs/bok_choy.yml
+++ /dev/null
@@ -1,150 +0,0 @@
-# ingested bok_choy.env.json
-# ingested bok_choy.auth.json
-AWS_ACCESS_KEY_ID: ''
-AWS_SECRET_ACCESS_KEY: ''
-BUGS_EMAIL: bugs@example.com
-BULK_EMAIL_DEFAULT_FROM_EMAIL: no-reply@example.com
-CACHES:
-  celery:
-    BACKEND: django.core.cache.backends.memcached.PyMemcacheCache
-    OPTIONS:
-      ignore_exc: true
-      no_delay: true
-      use_pooling: true
-    KEY_FUNCTION: common.djangoapps.util.memcache.safe_key
-    KEY_PREFIX: integration_celery
-    LOCATION: ['localhost:11211']
-  default:
-    BACKEND: django.core.cache.backends.memcached.PyMemcacheCache
-    OPTIONS:
-      ignore_exc: true
-      no_delay: true
-      use_pooling: true
-    KEY_FUNCTION: common.djangoapps.util.memcache.safe_key
-    KEY_PREFIX: sandbox_default
-    LOCATION: ['localhost:11211']
-  general:
-    BACKEND: django.core.cache.backends.memcached.PyMemcacheCache
-    OPTIONS:
-      ignore_exc: true
-      no_delay: true
-      use_pooling: true
-    KEY_FUNCTION: common.djangoapps.util.memcache.safe_key
-    KEY_PREFIX: sandbox_general
-    LOCATION: ['localhost:11211']
-  mongo_metadata_inheritance:
-    BACKEND: django.core.cache.backends.memcached.PyMemcacheCache
-    OPTIONS:
-      ignore_exc: true
-      no_delay: true
-      use_pooling: true
-    KEY_FUNCTION: common.djangoapps.util.memcache.safe_key
-    KEY_PREFIX: integration_mongo_metadata_inheritance
-    LOCATION: ['localhost:11211']
-  staticfiles:
-    BACKEND: django.core.cache.backends.memcached.PyMemcacheCache
-    OPTIONS:
-      ignore_exc: true
-      no_delay: true
-      use_pooling: true
-    KEY_FUNCTION: common.djangoapps.util.memcache.safe_key
-    KEY_PREFIX: integration_static_files
-    LOCATION: ['localhost:11211']
-CELERY_ALWAYS_EAGER: true
-CELERY_BROKER_HOSTNAME: localhost
-CELERY_BROKER_PASSWORD: celery
-CELERY_BROKER_TRANSPORT: amqp
-CELERY_BROKER_USER: celery
-CLEAR_REQUEST_CACHE_ON_TASK_COMPLETION: false
-CERT_QUEUE: certificates
-CMS_BASE: localhost:8031
-CODE_JAIL:
-  limits: {REALTIME: 3, VMEM: 0}
-COMMENTS_SERVICE_KEY: password
-COMMENTS_SERVICE_URL: http://localhost:4567
-CONTACT_EMAIL: info@example.com
-CONTENTSTORE:
-  DOC_STORE_CONFIG:
-    collection: modulestore
-    db: test
-    host: [localhost]
-    port: 27017
-  ENGINE: xmodule.contentstore.mongo.MongoContentStore
-  OPTIONS:
-    db: test
-    host: [localhost]
-    port: 27017
-DATABASES:
-  default: {ENGINE: django.db.backends.mysql, HOST: localhost, NAME: edxtest, PASSWORD: '',
-    PORT: '3306', USER: root}
-  student_module_history: {ENGINE: django.db.backends.mysql, HOST: localhost, NAME: student_module_history_test,
-    PASSWORD: '', PORT: '3306', USER: root}
-DEFAULT_FEEDBACK_EMAIL: feedback@example.com
-DEFAULT_FROM_EMAIL: registration@example.com
-DJFS: {aws_access_key_id: test, aws_secret_access_key: test, bucket: test, prefix: test,
-  type: s3fs}
-DOC_STORE_CONFIG:
-  collection: modulestore
-  db: test
-  host: [localhost]
-  port: 27017
-EMAIL_BACKEND: django.core.mail.backends.smtp.EmailBackend
-FEATURES: {CERTIFICATES_HTML_VIEW: true, CUSTOM_COURSES_EDX: true,
-  ENABLE_CONTENT_LIBRARIES: true, ENABLE_DISCUSSION_SERVICE: true, ENABLE_EXTENDED_COURSE_DETAILS: true,
-  ENABLE_GRADE_DOWNLOADS: true, ENABLE_SPECIAL_EXAMS: true, ENTRANCE_EXAMS: true,
-  MILESTONES_APP: true, PREVIEW_LMS_BASE: 'preview.localhost:8003', SHOW_HEADER_LANGUAGE_SELECTOR: true}
-GITHUB_REPO_ROOT: '** OVERRIDDEN **'
-GRADES_DOWNLOAD: {BUCKET: edx-grades, ROOT_PATH: /tmp/edx-s3/grades, STORAGE_TYPE: localfs}
-JWT_AUTH: {JWT_PUBLIC_SIGNING_JWK_SET: '{"keys": [{"kid":
-    "BTZ9HA6K", "e": "AQAB", "kty": "RSA", "n": "o5cn3ljSRi6FaDEKTn0PS-oL9EFyv1pI7dRgffQLD1qf5D6sprmYfWWokSsrWig8u2y0HChSygR6Jn5KXBqQn6FpM0dDJLnWQDRXHLl3Ey1iPYgDSmOIsIGrV9ZyNCQwk03wAgWbfdBTig3QSDYD-sTNOs3pc4UD_PqAvU2nz_1SS2ZiOwOn5F6gulE1L0iE3KEUEvOIagfHNVhz0oxa_VRZILkzV-zr6R_TW1m97h4H8jXl_VJyQGyhMGGypuDrQ9_vaY_RLEulLCyY0INglHWQ7pckxBtI5q55-Vio2wgewe2_qYcGsnBGaDNbySAsvYcWRrqDiFyzrJYivodqTQ"}]}',
-  JWT_SECRET_KEY: super-secret-key}
-LMS_BASE: localhost:8003
-LMS_ROOT_URL: http://localhost:8003
-LOCAL_LOGLEVEL: INFO
-LOGGING_ENV: sandbox
-LOG_DIR: '** OVERRIDDEN **'
-MEDIA_URL: /media/
-MKTG_URL_LINK_MAP: {}
-MODULESTORE:
-  default:
-    ENGINE: xmodule.modulestore.mixed.MixedModuleStore
-    OPTIONS:
-      mappings: {}
-      stores:
-      - DOC_STORE_CONFIG:
-          collection: modulestore
-          db: test
-          host: [localhost]
-          port: 27017
-        ENGINE: xmodule.modulestore.mongo.DraftMongoModuleStore
-        NAME: draft
-        OPTIONS:
-          collection: modulestore
-          db: test
-          default_class: xmodule.hidden_block.HiddenBlock
-          fs_root: '** OVERRIDDEN **'
-          host: [localhost]
-          port: 27017
-          render_template: common.djangoapps.edxmako.shortcuts.render_to_string
-      - ENGINE: xmodule.modulestore.xml.XMLModuleStore
-        NAME: xml
-        OPTIONS: {data_dir: '** OVERRIDDEN **', default_class: xmodule.hidden_block.HiddenBlock}
-# We need to test different scenarios, following setting effectively disbale rate limiting
-PASSWORD_RESET_IP_RATE: '1/s'
-PASSWORD_RESET_EMAIL_RATE: '1/s'
-SECRET_KEY: ''
-SERVER_EMAIL: devops@example.com
-SESSION_COOKIE_DOMAIN: null
-SITE_NAME: localhost
-SOCIAL_SHARING_SETTINGS: {CUSTOM_COURSE_URLS: true}
-STATIC_URL_BASE: /static/
-SYSLOG_SERVER: ''
-TECH_SUPPORT_EMAIL: technical@example.com
-TIME_ZONE: America/New_York
-WIKI_ENABLED: true
-XQUEUE_INTERFACE:
-  basic_auth: [edx, edx]
-  django_auth: {password: password, username: lms}
-  url: http://localhost:18040
-ZENDESK_API_KEY: ''
-ZENDESK_USER: ''
diff --git a/cms/envs/bok_choy_docker.auth.json b/cms/envs/bok_choy_docker.auth.json
deleted file mode 100644
index 9a187c05b153..000000000000
--- a/cms/envs/bok_choy_docker.auth.json
+++ /dev/null
@@ -1,116 +0,0 @@
-{
-    "AWS_ACCESS_KEY_ID": "",
-    "AWS_SECRET_ACCESS_KEY": "",
-    "CELERY_BROKER_PASSWORD": "celery",
-    "CELERY_BROKER_USER": "celery",
-    "CONTENTSTORE": {
-        "DOC_STORE_CONFIG": {
-            "collection": "modulestore",
-            "db": "test",
-            "host": [
-                "edx.devstack.mongo"
-            ],
-            "port": 27017
-        },
-        "ENGINE": "xmodule.contentstore.mongo.MongoContentStore",
-        "OPTIONS": {
-            "db": "test",
-            "host": [
-                "edx.devstack.mongo"
-            ],
-            "port": 27017
-        }
-    },
-    "DATABASES": {
-        "default": {
-            "ENGINE": "django.db.backends.mysql",
-            "HOST": "edx.devstack.mysql80",
-            "NAME": "edxtest",
-            "PASSWORD": "",
-            "PORT": "3306",
-            "USER": "root"
-        },
-        "student_module_history": {
-            "ENGINE": "django.db.backends.mysql",
-            "HOST": "edx.devstack.mysql80",
-            "NAME": "student_module_history_test",
-            "PASSWORD": "",
-            "PORT": "3306",
-            "USER": "root"
-        }
-    },
-    "DOC_STORE_CONFIG": {
-        "collection": "modulestore",
-        "db": "test",
-        "host": [
-            "edx.devstack.mongo"
-        ],
-        "port": 27017
-    },
-    "JWT_AUTH": {
-        "JWT_SECRET_KEY": "super-secret-key",
-        "JWT_PUBLIC_SIGNING_JWK_SET": "{\"keys\": [{\"kid\": \"BTZ9HA6K\", \"e\": \"AQAB\", \"kty\": \"RSA\", \"n\": \"o5cn3ljSRi6FaDEKTn0PS-oL9EFyv1pI7dRgffQLD1qf5D6sprmYfWWokSsrWig8u2y0HChSygR6Jn5KXBqQn6FpM0dDJLnWQDRXHLl3Ey1iPYgDSmOIsIGrV9ZyNCQwk03wAgWbfdBTig3QSDYD-sTNOs3pc4UD_PqAvU2nz_1SS2ZiOwOn5F6gulE1L0iE3KEUEvOIagfHNVhz0oxa_VRZILkzV-zr6R_TW1m97h4H8jXl_VJyQGyhMGGypuDrQ9_vaY_RLEulLCyY0INglHWQ7pckxBtI5q55-Vio2wgewe2_qYcGsnBGaDNbySAsvYcWRrqDiFyzrJYivodqTQ\"}]}"
-    },
-    "MODULESTORE": {
-        "default": {
-            "ENGINE": "xmodule.modulestore.mixed.MixedModuleStore",
-            "OPTIONS": {
-                "mappings": {},
-                "stores": [
-                    {
-                        "NAME": "draft",
-                        "DOC_STORE_CONFIG": {
-                            "collection": "modulestore",
-                            "db": "test",
-                            "host": [
-                                "edx.devstack.mongo"
-                            ],
-                            "port": 27017
-                        },
-                        "ENGINE": "xmodule.modulestore.mongo.DraftMongoModuleStore",
-                        "OPTIONS": {
-                            "collection": "modulestore",
-                            "db": "test",
-                            "default_class": "xmodule.hidden_block.HiddenBlock",
-                            "fs_root": "** OVERRIDDEN **",
-                            "host": [
-                                "edx.devstack.mongo"
-                            ],
-                            "port": 27017,
-                            "render_template": "common.djangoapps.edxmako.shortcuts.render_to_string"
-                        }
-                    },
-                    {
-                        "NAME": "xml",
-                        "ENGINE": "xmodule.modulestore.xml.XMLModuleStore",
-                        "OPTIONS": {
-                            "data_dir": "** OVERRIDDEN **",
-                            "default_class": "xmodule.hidden_block.HiddenBlock"
-                        }
-                    }
-                ]
-            }
-        }
-    },
-    "DJFS": {
-            "type": "s3fs",
-            "bucket": "test",
-            "prefix": "test",
-            "aws_access_key_id": "test",
-            "aws_secret_access_key": "test"
-    },
-    "SECRET_KEY": "",
-    "XQUEUE_INTERFACE": {
-        "basic_auth": [
-            "edx",
-            "edx"
-        ],
-        "django_auth": {
-            "password": "password",
-            "username": "lms"
-        },
-        "url": "http://localhost:18040"
-    },
-    "ZENDESK_API_KEY": "",
-    "ZENDESK_USER": ""
-}
diff --git a/cms/envs/bok_choy_docker.env.json b/cms/envs/bok_choy_docker.env.json
deleted file mode 100644
index 47fed49f1a38..000000000000
--- a/cms/envs/bok_choy_docker.env.json
+++ /dev/null
@@ -1,126 +0,0 @@
-{
-    "BUGS_EMAIL": "bugs@example.com",
-    "BULK_EMAIL_DEFAULT_FROM_EMAIL": "no-reply@example.com",
-    "CACHES": {
-        "celery": {
-            "BACKEND": "django.core.cache.backends.memcached.PyMemcacheCache",
-            "OPTIONS": {
-                "no_delay": true,
-                "ignore_exc": true,
-                "use_pooling": true
-            },
-            "KEY_FUNCTION": "common.djangoapps.util.memcache.safe_key",
-            "KEY_PREFIX": "integration_celery",
-            "LOCATION": [
-                "edx.devstack.memcached:11211"
-            ]
-        },
-        "default": {
-            "BACKEND": "django.core.cache.backends.memcached.PyMemcacheCache",
-            "OPTIONS": {
-                "no_delay": true,
-                "ignore_exc": true,
-                "use_pooling": true
-            },
-            "KEY_FUNCTION": "common.djangoapps.util.memcache.safe_key",
-            "KEY_PREFIX": "sandbox_default",
-            "LOCATION": [
-                "edx.devstack.memcached:11211"
-            ]
-        },
-        "general": {
-            "BACKEND": "django.core.cache.backends.memcached.PyMemcacheCache",
-            "OPTIONS": {
-                "no_delay": true,
-                "ignore_exc": true,
-                "use_pooling": true
-            },
-            "KEY_FUNCTION": "common.djangoapps.util.memcache.safe_key",
-            "KEY_PREFIX": "sandbox_general",
-            "LOCATION": [
-                "edx.devstack.memcached:11211"
-            ]
-        },
-        "mongo_metadata_inheritance": {
-            "BACKEND": "django.core.cache.backends.memcached.PyMemcacheCache",
-            "OPTIONS": {
-                "no_delay": true,
-                "ignore_exc": true,
-                "use_pooling": true
-            },
-            "KEY_FUNCTION": "common.djangoapps.util.memcache.safe_key",
-            "KEY_PREFIX": "integration_mongo_metadata_inheritance",
-            "LOCATION": [
-                "edx.devstack.memcached:11211"
-            ]
-        },
-        "staticfiles": {
-            "BACKEND": "django.core.cache.backends.memcached.PyMemcacheCache",
-            "OPTIONS": {
-                "no_delay": true,
-                "ignore_exc": true,
-                "use_pooling": true
-            },
-            "KEY_FUNCTION": "common.djangoapps.util.memcache.safe_key",
-            "KEY_PREFIX": "integration_static_files",
-            "LOCATION": [
-                "edx.devstack.memcached:11211"
-            ]
-        }
-    },
-    "CELERY_ALWAYS_EAGER": true,
-    "CLEAR_REQUEST_CACHE_ON_TASK_COMPLETION": false,
-    "CELERY_BROKER_HOSTNAME": "localhost",
-    "CELERY_BROKER_TRANSPORT": "amqp",
-    "CERT_QUEUE": "certificates",
-    "CMS_BASE": "** OVERRIDDEN **",
-    "CODE_JAIL": {
-        "limits": {
-            "REALTIME": 3,
-            "VMEM": 0
-        }
-    },
-    "COMMENTS_SERVICE_KEY": "password",
-    "COMMENTS_SERVICE_URL": "http://edx.devstack.studio:4567",
-    "CONTACT_EMAIL": "info@example.com",
-    "DEFAULT_FEEDBACK_EMAIL": "feedback@example.com",
-    "DEFAULT_FROM_EMAIL": "registration@example.com",
-    "EMAIL_BACKEND": "django.core.mail.backends.smtp.EmailBackend",
-    "SOCIAL_SHARING_SETTINGS": {
-        "CUSTOM_COURSE_URLS": true
-    },
-    "FEATURES": {
-        "CERTIFICATES_HTML_VIEW": true,
-        "ENABLE_DISCUSSION_SERVICE": true,
-        "ENABLE_GRADE_DOWNLOADS": true,
-        "ENTRANCE_EXAMS": true,
-        "MILESTONES_APP": true,
-        "PREVIEW_LMS_BASE": "preview.localhost:8003",
-        "ENABLE_CONTENT_LIBRARIES": true,
-        "ENABLE_SPECIAL_EXAMS": true,
-        "SHOW_HEADER_LANGUAGE_SELECTOR": true,
-        "ENABLE_EXTENDED_COURSE_DETAILS": true,
-        "CUSTOM_COURSES_EDX": true
-    },
-    "GITHUB_REPO_ROOT": "** OVERRIDDEN **",
-    "GRADES_DOWNLOAD": {
-        "BUCKET": "edx-grades",
-        "ROOT_PATH": "/tmp/edx-s3/grades",
-        "STORAGE_TYPE": "localfs"
-    },
-    "LMS_BASE": "** OVERRIDDEN **",
-    "LMS_ROOT_URL": "** OVERRIDDEN **",
-    "LOCAL_LOGLEVEL": "INFO",
-    "LOGGING_ENV": "sandbox",
-    "LOG_DIR": "** OVERRIDDEN **",
-    "MEDIA_URL": "/media/",
-    "MKTG_URL_LINK_MAP": {},
-    "SERVER_EMAIL": "devops@example.com",
-    "SESSION_COOKIE_DOMAIN": null,
-    "SITE_NAME": "localhost",
-    "STATIC_URL_BASE": "/static/",
-    "SYSLOG_SERVER": "",
-    "TECH_SUPPORT_EMAIL": "technical@example.com",
-    "TIME_ZONE": "America/New_York",
-    "WIKI_ENABLED": true,
-}
diff --git a/cms/envs/bok_choy_docker.py b/cms/envs/bok_choy_docker.py
deleted file mode 100644
index 878537de008d..000000000000
--- a/cms/envs/bok_choy_docker.py
+++ /dev/null
@@ -1,26 +0,0 @@
-"""
-Settings for Bok Choy tests that are used when running Studio in Docker-based devstack.
-"""
-
-# noinspection PyUnresolvedReferences
-from .bok_choy import *  # pylint: disable=wildcard-import
-
-CMS_BASE = '{}:{}'.format(os.environ['BOK_CHOY_HOSTNAME'], os.environ.get('BOK_CHOY_CMS_PORT', 8031))
-LMS_BASE = '{}:{}'.format(os.environ['BOK_CHOY_HOSTNAME'], os.environ.get('BOK_CHOY_LMS_PORT', 8003))
-LMS_ROOT_URL = f'http://{LMS_BASE}'
-LOGIN_REDIRECT_WHITELIST = [CMS_BASE]
-
-COMMENTS_SERVICE_URL = 'http://{}:4567'.format(os.environ['BOK_CHOY_HOSTNAME'])
-EDXNOTES_PUBLIC_API = 'http://{}:8042/api/v1'.format(os.environ['BOK_CHOY_HOSTNAME'])
-
-# Docker does not support the syslog socket at /dev/log. Rely on the console.
-LOGGING['handlers']['local'] = LOGGING['handlers']['tracking'] = {
-    'class': 'logging.NullHandler',
-}
-
-LOGGING['loggers']['tracking']['handlers'] = ['console']
-
-# Point the URL used to test YouTube availability to our stub YouTube server
-BOK_CHOY_HOST = os.environ['BOK_CHOY_HOSTNAME']
-YOUTUBE['API'] = f"http://{BOK_CHOY_HOST}:{YOUTUBE_PORT}/get_youtube_api/"
-YOUTUBE['METADATA_URL'] = f"http://{BOK_CHOY_HOST}:{YOUTUBE_PORT}/test_youtube/"
diff --git a/cms/envs/bok_choy_docker.yml b/cms/envs/bok_choy_docker.yml
deleted file mode 100644
index 779751ecb69e..000000000000
--- a/cms/envs/bok_choy_docker.yml
+++ /dev/null
@@ -1,147 +0,0 @@
-# ingested bok_choy_docker.env.json
-# ingested bok_choy_docker.auth.json
-AWS_ACCESS_KEY_ID: ''
-AWS_SECRET_ACCESS_KEY: ''
-BUGS_EMAIL: bugs@example.com
-BULK_EMAIL_DEFAULT_FROM_EMAIL: no-reply@example.com
-CACHES:
-  celery:
-    BACKEND: django.core.cache.backends.memcached.PyMemcacheCache
-    OPTIONS:
-      no_delay: true
-      ignore_exc: true
-      use_pooling: true
-    KEY_FUNCTION: common.djangoapps.util.memcache.safe_key
-    KEY_PREFIX: integration_celery
-    LOCATION: ['edx.devstack.memcached:11211']
-  default:
-    BACKEND: django.core.cache.backends.memcached.PyMemcacheCache
-    OPTIONS:
-      no_delay: true
-      ignore_exc: true
-      use_pooling: true
-    KEY_FUNCTION: common.djangoapps.util.memcache.safe_key
-    KEY_PREFIX: sandbox_default
-    LOCATION: ['edx.devstack.memcached:11211']
-  general:
-    BACKEND: django.core.cache.backends.memcached.PyMemcacheCache
-    OPTIONS:
-      no_delay: true
-      ignore_exc: true
-      use_pooling: true
-    KEY_FUNCTION: common.djangoapps.util.memcache.safe_key
-    KEY_PREFIX: sandbox_general
-    LOCATION: ['edx.devstack.memcached:11211']
-  mongo_metadata_inheritance:
-    BACKEND: django.core.cache.backends.memcached.PyMemcacheCache
-    OPTIONS:
-      no_delay: true
-      ignore_exc: true
-      use_pooling: true
-    KEY_FUNCTION: common.djangoapps.util.memcache.safe_key
-    KEY_PREFIX: integration_mongo_metadata_inheritance
-    LOCATION: ['edx.devstack.memcached:11211']
-  staticfiles:
-    BACKEND: django.core.cache.backends.memcached.PyMemcacheCache
-    OPTIONS:
-      no_delay: true
-      ignore_exc: true
-      use_pooling: true
-    KEY_FUNCTION: common.djangoapps.util.memcache.safe_key
-    KEY_PREFIX: integration_static_files
-    LOCATION: ['edx.devstack.memcached:11211']
-CELERY_ALWAYS_EAGER: true
-CELERY_BROKER_HOSTNAME: localhost
-CELERY_BROKER_PASSWORD: celery
-CELERY_BROKER_TRANSPORT: amqp
-CELERY_BROKER_USER: celery
-CERT_QUEUE: certificates
-CLEAR_REQUEST_CACHE_ON_TASK_COMPLETION: false
-CMS_BASE: '** OVERRIDDEN **'
-CODE_JAIL:
-  limits: {REALTIME: 3, VMEM: 0}
-COMMENTS_SERVICE_KEY: password
-COMMENTS_SERVICE_URL: http://edx.devstack.studio:4567
-CONTACT_EMAIL: info@example.com
-CONTENTSTORE:
-  DOC_STORE_CONFIG:
-    collection: modulestore
-    db: test
-    host: [edx.devstack.mongo]
-    port: 27017
-  ENGINE: xmodule.contentstore.mongo.MongoContentStore
-  OPTIONS:
-    db: test
-    host: [edx.devstack.mongo]
-    port: 27017
-DATABASES:
-  default: {ENGINE: django.db.backends.mysql, HOST: edx.devstack.mysql80, NAME: edxtest,
-    PASSWORD: '', PORT: '3306', USER: root}
-  student_module_history: {ENGINE: django.db.backends.mysql, HOST: edx.devstack.mysql80,
-    NAME: student_module_history_test, PASSWORD: '', PORT: '3306', USER: root}
-DEFAULT_FEEDBACK_EMAIL: feedback@example.com
-DEFAULT_FROM_EMAIL: registration@example.com
-DJFS: {aws_access_key_id: test, aws_secret_access_key: test, bucket: test, prefix: test,
-  type: s3fs}
-DOC_STORE_CONFIG:
-  collection: modulestore
-  db: test
-  host: [edx.devstack.mongo]
-  port: 27017
-EMAIL_BACKEND: django.core.mail.backends.smtp.EmailBackend
-FEATURES: {CERTIFICATES_HTML_VIEW: true, CUSTOM_COURSES_EDX: true,
-  ENABLE_CONTENT_LIBRARIES: true, ENABLE_DISCUSSION_SERVICE: true, ENABLE_EXTENDED_COURSE_DETAILS: true,
-  ENABLE_GRADE_DOWNLOADS: true, ENABLE_SPECIAL_EXAMS: true, ENTRANCE_EXAMS: true,
-  MILESTONES_APP: true, PREVIEW_LMS_BASE: 'preview.localhost:8003', SHOW_HEADER_LANGUAGE_SELECTOR: true}
-GITHUB_REPO_ROOT: '** OVERRIDDEN **'
-GRADES_DOWNLOAD: {BUCKET: edx-grades, ROOT_PATH: /tmp/edx-s3/grades, STORAGE_TYPE: localfs}
-JWT_AUTH: {JWT_PUBLIC_SIGNING_JWK_SET: '{"keys": [{"kid":
-    "BTZ9HA6K", "e": "AQAB", "kty": "RSA", "n": "o5cn3ljSRi6FaDEKTn0PS-oL9EFyv1pI7dRgffQLD1qf5D6sprmYfWWokSsrWig8u2y0HChSygR6Jn5KXBqQn6FpM0dDJLnWQDRXHLl3Ey1iPYgDSmOIsIGrV9ZyNCQwk03wAgWbfdBTig3QSDYD-sTNOs3pc4UD_PqAvU2nz_1SS2ZiOwOn5F6gulE1L0iE3KEUEvOIagfHNVhz0oxa_VRZILkzV-zr6R_TW1m97h4H8jXl_VJyQGyhMGGypuDrQ9_vaY_RLEulLCyY0INglHWQ7pckxBtI5q55-Vio2wgewe2_qYcGsnBGaDNbySAsvYcWRrqDiFyzrJYivodqTQ"}]}',
-  JWT_SECRET_KEY: super-secret-key}
-LMS_BASE: '** OVERRIDDEN **'
-LMS_ROOT_URL: '** OVERRIDDEN **'
-LOCAL_LOGLEVEL: INFO
-LOGGING_ENV: sandbox
-LOG_DIR: '** OVERRIDDEN **'
-MEDIA_URL: /media/
-MKTG_URL_LINK_MAP: {}
-MODULESTORE:
-  default:
-    ENGINE: xmodule.modulestore.mixed.MixedModuleStore
-    OPTIONS:
-      mappings: {}
-      stores:
-      - DOC_STORE_CONFIG:
-          collection: modulestore
-          db: test
-          host: [edx.devstack.mongo]
-          port: 27017
-        ENGINE: xmodule.modulestore.mongo.DraftMongoModuleStore
-        NAME: draft
-        OPTIONS:
-          collection: modulestore
-          db: test
-          default_class: xmodule.hidden_block.HiddenBlock
-          fs_root: '** OVERRIDDEN **'
-          host: [edx.devstack.mongo]
-          port: 27017
-          render_template: common.djangoapps.edxmako.shortcuts.render_to_string
-      - ENGINE: xmodule.modulestore.xml.XMLModuleStore
-        NAME: xml
-        OPTIONS: {data_dir: '** OVERRIDDEN **', default_class: xmodule.hidden_block.HiddenBlock}
-SECRET_KEY: ''
-SERVER_EMAIL: devops@example.com
-SESSION_COOKIE_DOMAIN: null
-SITE_NAME: localhost
-SOCIAL_SHARING_SETTINGS: {CUSTOM_COURSE_URLS: true}
-STATIC_URL_BASE: /static/
-SYSLOG_SERVER: ''
-TECH_SUPPORT_EMAIL: technical@example.com
-TIME_ZONE: America/New_York
-WIKI_ENABLED: true
-XQUEUE_INTERFACE:
-  basic_auth: [edx, edx]
-  django_auth: {password: password, username: lms}
-  url: http://localhost:18040
-ZENDESK_API_KEY: ''
-ZENDESK_USER: ''
diff --git a/cms/envs/common.py b/cms/envs/common.py
index 40b5be678939..917f6859a613 100644
--- a/cms/envs/common.py
+++ b/cms/envs/common.py
@@ -121,6 +121,9 @@
     # Methods to derive settings
     _make_mako_template_dirs,
     _make_locale_paths,
+
+    # Password Validator Settings
+    AUTH_PASSWORD_VALIDATORS
 )
 from path import Path as path
 from django.urls import reverse_lazy
@@ -318,9 +321,6 @@
     # Show video bumper in Studio
     'ENABLE_VIDEO_BUMPER': False,
 
-    # Show issue open badges in Studio
-    'ENABLE_OPENBADGES': False,
-
     # How many seconds to show the bumper again, default is 7 days:
     'SHOW_BUMPER_PERIODICITY': 7 * 24 * 3600,
 
@@ -531,6 +531,19 @@
     # .. toggle_creation_date: 2023-03-31
     # .. toggle_tickets: https://github.com/openedx/edx-platform/pull/32015
     'DISABLE_ADVANCED_SETTINGS': False,
+
+    # .. toggle_name: FEATURES['ENABLE_SEND_XBLOCK_LIFECYCLE_EVENTS_OVER_BUS']
+    # .. toggle_implementation: DjangoSetting
+    # .. toggle_default: False
+    # .. toggle_description: Enables sending xblock lifecycle events over the event bus. Used to create the
+    #   EVENT_BUS_PRODUCER_CONFIG setting
+    # .. toggle_use_cases: opt_in
+    # .. toggle_creation_date: 2023-10-10
+    # .. toggle_target_removal_date: 2023-10-12
+    # .. toggle_warning: The default may be changed in a later release. See
+    #   https://github.com/openedx/openedx-events/issues/265
+    # .. toggle_tickets: https://github.com/edx/edx-arch-experiments/issues/381
+    'ENABLE_SEND_XBLOCK_LIFECYCLE_EVENTS_OVER_BUS': False,
 }
 
 # .. toggle_name: ENABLE_COPPA_COMPLIANCE
@@ -1795,6 +1808,7 @@
 
     # alternative swagger generator for CMS API
     'drf_spectacular',
+    'openedx_events',
 ]
 
 
@@ -1879,24 +1893,6 @@
 EVENT_TRACKING_SEGMENTIO_EMIT_WHITELIST = []
 
 #### PASSWORD POLICY SETTINGS #####
-AUTH_PASSWORD_VALIDATORS = [
-    {
-        "NAME": "django.contrib.auth.password_validation.UserAttributeSimilarityValidator",
-    },
-    {
-        "NAME": "common.djangoapps.util.password_policy_validators.MinimumLengthValidator",
-        "OPTIONS": {
-            "min_length": 2
-        }
-    },
-    {
-        "NAME": "common.djangoapps.util.password_policy_validators.MaximumLengthValidator",
-        "OPTIONS": {
-            "max_length": 75
-        }
-    },
-]
-
 PASSWORD_POLICY_COMPLIANCE_ROLLOUT_CONFIG = {
     'ENFORCE_COMPLIANCE_ON_LOGIN': False
 }
@@ -2186,6 +2182,7 @@
             'no_delay': True,
             'ignore_exc': True,
             'use_pooling': True,
+            'connect_timeout': 0.5
         }
     },
     'course_structure_cache': {
@@ -2198,6 +2195,7 @@
             'no_delay': True,
             'ignore_exc': True,
             'use_pooling': True,
+            'connect_timeout': 0.5
         }
     },
     'celery': {
@@ -2210,6 +2208,7 @@
             'no_delay': True,
             'ignore_exc': True,
             'use_pooling': True,
+            'connect_timeout': 0.5
         }
     },
     'mongo_metadata_inheritance': {
@@ -2222,6 +2221,7 @@
             'no_delay': True,
             'ignore_exc': True,
             'use_pooling': True,
+            'connect_timeout': 0.5
         }
     },
     'staticfiles': {
@@ -2233,6 +2233,7 @@
             'no_delay': True,
             'ignore_exc': True,
             'use_pooling': True,
+            'connect_timeout': 0.5
         }
     },
     'default': {
@@ -2245,6 +2246,7 @@
             'no_delay': True,
             'ignore_exc': True,
             'use_pooling': True,
+            'connect_timeout': 0.5
         }
     },
     'configuration': {
@@ -2256,6 +2258,7 @@
             'no_delay': True,
             'ignore_exc': True,
             'use_pooling': True,
+            'connect_timeout': 0.5
         }
     },
     'general': {
@@ -2267,6 +2270,7 @@
             'no_delay': True,
             'ignore_exc': True,
             'use_pooling': True,
+            'connect_timeout': 0.5
         }
     },
 }
@@ -2651,6 +2655,9 @@
 }
 EDXAPP_PARSE_KEYS = {}
 
+############################ AI_TRANSLATIONS ##################################
+AI_TRANSLATIONS_API_URL = 'http://localhost:18760/api/v1'
+
 ###################### DEPRECATED URLS ##########################
 
 # .. toggle_name: DISABLE_DEPRECATED_SIGNIN_URL
@@ -2786,9 +2793,69 @@
     'DESCRIPTION': 'Experimental API to edit xblocks and course content. Danger: Do not use on running courses!',
     'VERSION': '1.0.0',
     'SERVE_INCLUDE_SCHEMA': False,
-    'PREPROCESSING_HOOKS': ['cms.lib.spectacular.cms_api_filter'],  # restrict spectacular to CMS API endpoints
+    'PREPROCESSING_HOOKS': ['cms.lib.spectacular.cms_api_filter'],  # restrict spectacular to CMS API endpoints. (cms/lib/spectacular.py)
 }
 
-#### Event bus publishing ####
-## Will be more filled out as part of https://github.com/edx/edx-arch-experiments/issues/381
-EVENT_BUS_PRODUCER_CONFIG = {}
+
+#### Event bus producing ####
+def _should_send_xblock_events(settings):
+    return settings.FEATURES['ENABLE_SEND_XBLOCK_LIFECYCLE_EVENTS_OVER_BUS']
+
+# .. setting_name: EVENT_BUS_PRODUCER_CONFIG
+# .. setting_default: all events disabled
+# .. setting_description: Dictionary of event_types mapped to dictionaries of topic to topic-related configuration.
+#    Each topic configuration dictionary contains
+#    * `enabled`: a toggle denoting whether the event will be published to the topic. These should be annotated
+#       according to
+#       https://edx.readthedocs.io/projects/edx-toggles/en/latest/how_to/documenting_new_feature_toggles.html
+#    * `event_key_field` which is a period-delimited string path to event data field to use as event key.
+#    Note: The topic names should not include environment prefix as it will be dynamically added based on
+#    EVENT_BUS_TOPIC_PREFIX setting.
+
+EVENT_BUS_PRODUCER_CONFIG = {
+    'org.openedx.content_authoring.course.catalog_info.changed.v1': {
+        'course-catalog-info-changed':
+            {'event_key_field': 'catalog_info.course_key',
+             # .. toggle_name: EVENT_BUS_PRODUCER_CONFIG['org.openedx.content_authoring.course.catalog_info.changed.v1']
+             #    ['course-catalog-info-changed']['enabled']
+             # .. toggle_implementation: DjangoSetting
+             # .. toggle_default: False
+             # .. toggle_description: if enabled, will publish COURSE_CATALOG_INFO_CHANGED events to the event bus on
+             #    the course-catalog-info-changed topics
+             # .. toggle_warning: The default may be changed in a later release. See
+             #    https://github.com/openedx/openedx-events/issues/265
+             # .. toggle_use_cases: opt_in
+             # .. toggle_creation_date: 2023-10-10
+             'enabled': False},
+    },
+    'org.openedx.content_authoring.xblock.published.v1': {
+        'course-authoring-xblock-lifecycle':
+            {'event_key_field': 'xblock_info.usage_key', 'enabled': _should_send_xblock_events},
+    },
+    'org.openedx.content_authoring.xblock.deleted.v1': {
+        'course-authoring-xblock-lifecycle':
+            {'event_key_field': 'xblock_info.usage_key', 'enabled': _should_send_xblock_events},
+    },
+    'org.openedx.content_authoring.xblock.duplicated.v1': {
+        'course-authoring-xblock-lifecycle':
+            {'event_key_field': 'xblock_info.usage_key', 'enabled': _should_send_xblock_events},
+    },
+    # LMS events. These have to be copied over here because lms.common adds some derived entries as well,
+    # and the derivation fails if the keys are missing. If we ever remove the import of lms.common, we can remove these.
+    'org.openedx.learning.certificate.created.v1': {
+        'learning-certificate-lifecycle':
+            {'event_key_field': 'certificate.course.course_key', 'enabled': False},
+    },
+    'org.openedx.learning.certificate.revoked.v1': {
+        'learning-certificate-lifecycle':
+            {'event_key_field': 'certificate.course.course_key', 'enabled': False},
+    },
+}
+
+
+derived_collection_entry('EVENT_BUS_PRODUCER_CONFIG', 'org.openedx.content_authoring.xblock.published.v1',
+                         'course-authoring-xblock-lifecycle', 'enabled')
+derived_collection_entry('EVENT_BUS_PRODUCER_CONFIG', 'org.openedx.content_authoring.xblock.duplicated.v1',
+                         'course-authoring-xblock-lifecycle', 'enabled')
+derived_collection_entry('EVENT_BUS_PRODUCER_CONFIG', 'org.openedx.content_authoring.xblock.deleted.v1',
+                         'course-authoring-xblock-lifecycle', 'enabled')
diff --git a/cms/envs/devstack-experimental.yml b/cms/envs/devstack-experimental.yml
index e33c024b0f2a..ad6126086949 100644
--- a/cms/envs/devstack-experimental.yml
+++ b/cms/envs/devstack-experimental.yml
@@ -57,6 +57,7 @@ CACHES:
             no_delay: true
             ignore_exc: true
             use_pooling: true
+            connect_timeout: 0.5
         KEY_FUNCTION: common.djangoapps.util.memcache.safe_key
         KEY_PREFIX: celery
         LOCATION:
@@ -68,6 +69,7 @@ CACHES:
             no_delay: true
             ignore_exc: true
             use_pooling: true
+            connect_timeout: 0.5
         KEY_FUNCTION: common.djangoapps.util.memcache.safe_key
         KEY_PREFIX: 78f87108afce
         LOCATION:
@@ -78,6 +80,7 @@ CACHES:
             no_delay: true
             ignore_exc: true
             use_pooling: true
+            connect_timeout: 0.5
         KEY_FUNCTION: common.djangoapps.util.memcache.safe_key
         KEY_PREFIX: course_structure
         LOCATION:
@@ -89,6 +92,7 @@ CACHES:
             ignore_exc: true
             no_delay: true
             use_pooling: true
+            connect_timeout: 0.5
         KEY_FUNCTION: common.djangoapps.util.memcache.safe_key
         KEY_PREFIX: default
         LOCATION:
@@ -100,6 +104,7 @@ CACHES:
             no_delay: true
             ignore_exc: true
             use_pooling: true
+            connect_timeout: 0.5
         KEY_FUNCTION: common.djangoapps.util.memcache.safe_key
         KEY_PREFIX: general
         LOCATION:
@@ -110,6 +115,7 @@ CACHES:
             no_delay: true
             ignore_exc: true
             use_pooling: true
+            connect_timeout: 0.5
         KEY_FUNCTION: common.djangoapps.util.memcache.safe_key
         KEY_PREFIX: mongo_metadata_inheritance
         LOCATION:
@@ -121,6 +127,7 @@ CACHES:
             no_delay: true
             ignore_exc: true
             use_pooling: true
+            connect_timeout: 0.5
         KEY_FUNCTION: common.djangoapps.util.memcache.safe_key
         KEY_PREFIX: 78f87108afce_general
         LOCATION:
diff --git a/cms/envs/devstack.py b/cms/envs/devstack.py
index 61359d0611f3..dd2f4522b648 100644
--- a/cms/envs/devstack.py
+++ b/cms/envs/devstack.py
@@ -300,24 +300,26 @@ def should_show_debug_toolbar(request):  # lint-amnesty, pylint: disable=missing
 CREDENTIALS_INTERNAL_SERVICE_URL = 'http://localhost:18150'
 CREDENTIALS_PUBLIC_SERVICE_URL = 'http://localhost:18150'
 
+############################ AI_TRANSLATIONS ##################################
+AI_TRANSLATIONS_API_URL = 'http://localhost:18760/api/v1'
+
 #################### Event bus backend ########################
-# .. toggle_name: FEATURES['ENABLE_SEND_XBLOCK_EVENTS_OVER_BUS']
-# .. toggle_implementation: DjangoSetting
-# .. toggle_default: False
-# .. toggle_description: Temporary configuration which enables sending xblock events over the event bus.
-# .. toggle_use_cases: open_edx
-# .. toggle_creation_date: 2023-02-21
-# .. toggle_warning: For consistency in user experience, keep the value in sync with the setting of the same name
-#   in the LMS and CMS.
-# .. toggle_tickets: 'https://github.com/openedx/edx-platform/pull/31813'
-FEATURES['ENABLE_SEND_XBLOCK_EVENTS_OVER_BUS'] = True
-FEATURES['ENABLE_SEND_ENROLLMENT_EVENTS_OVER_BUS'] = True
+
 EVENT_BUS_PRODUCER = 'edx_event_bus_redis.create_producer'
 EVENT_BUS_REDIS_CONNECTION_URL = 'redis://:password@edx.devstack.redis:6379/'
 EVENT_BUS_TOPIC_PREFIX = 'dev'
 EVENT_BUS_CONSUMER = 'edx_event_bus_redis.RedisEventConsumer'
-EVENT_BUS_XBLOCK_LIFECYCLE_TOPIC = 'course-authoring-xblock-lifecycle'
-EVENT_BUS_ENROLLMENT_LIFECYCLE_TOPIC = 'course-authoring-enrollment-lifecycle'
+
+course_catalog_event_setting = EVENT_BUS_PRODUCER_CONFIG['org.openedx.content_authoring.course.catalog_info.changed.v1']
+course_catalog_event_setting['course-catalog-info-changed']['enabled'] = True
+
+xblock_published_event_setting = EVENT_BUS_PRODUCER_CONFIG['org.openedx.content_authoring.xblock.published.v1']
+xblock_published_event_setting['course-authoring-xblock-lifecycle']['enabled'] = True
+xblock_deleted_event_setting = EVENT_BUS_PRODUCER_CONFIG['org.openedx.content_authoring.xblock.deleted.v1']
+xblock_deleted_event_setting['course-authoring-xblock-lifecycle']['enabled'] = True
+xblock_duplicated_event_setting = EVENT_BUS_PRODUCER_CONFIG['org.openedx.content_authoring.xblock.duplicated.v1']
+xblock_duplicated_event_setting['course-authoring-xblock-lifecycle']['enabled'] = True
+
 
 ################# New settings must go ABOVE this line #################
 ########################################################################
diff --git a/cms/envs/production.py b/cms/envs/production.py
index 213243fa8237..d78971882e54 100644
--- a/cms/envs/production.py
+++ b/cms/envs/production.py
@@ -18,9 +18,9 @@
 from django.core.exceptions import ImproperlyConfigured
 from django.urls import reverse_lazy
 from edx_django_utils.plugins import add_plugins
+from openedx_events.event_bus import merge_producer_configs
 from path import Path as path
 
-
 from openedx.core.djangoapps.plugins.constants import ProjectType, SettingsType
 
 from .common import *
@@ -85,6 +85,7 @@ def get_env_setting(setting):
         'MKTG_URL_LINK_MAP',
         'MKTG_URL_OVERRIDES',
         'REST_FRAMEWORK',
+        'EVENT_BUS_PRODUCER_CONFIG',
     ]
     for key in KEYS_WITH_MERGED_VALUES:
         if key in __config_copy__:
@@ -659,6 +660,9 @@ def get_env_setting(setting):
 ################### Discussions micro frontend Feedback URL###################
 DISCUSSIONS_MFE_FEEDBACK_URL = ENV_TOKENS.get('DISCUSSIONS_MFE_FEEDBACK_URL', DISCUSSIONS_MFE_FEEDBACK_URL)
 
+############################ AI_TRANSLATIONS URL ##################################
+AI_TRANSLATIONS_API_URL = ENV_TOKENS.get('AI_TRANSLATIONS_API_URL', AI_TRANSLATIONS_API_URL)
+
 ############## DRF overrides ##############
 REST_FRAMEWORK.update(ENV_TOKENS.get('REST_FRAMEWORK', {}))
 
@@ -670,3 +674,7 @@ def get_env_setting(setting):
 }
 
 INACTIVE_USER_URL = f'http{"s" if HTTPS == "on" else ""}://{CMS_BASE}'
+
+############## Event bus producer ##############
+EVENT_BUS_PRODUCER_CONFIG = merge_producer_configs(EVENT_BUS_PRODUCER_CONFIG,
+                                                   ENV_TOKENS.get('EVENT_BUS_PRODUCER_CONFIG', {}))
diff --git a/cms/envs/test_static_optimized.py b/cms/envs/test_static_optimized.py
index 61738c92548b..c92d9a7262ce 100644
--- a/cms/envs/test_static_optimized.py
+++ b/cms/envs/test_static_optimized.py
@@ -1,10 +1,6 @@
 """
 Settings used when generating static assets for use in tests.
 
-For example, Bok Choy uses two different settings files:
-1. test_static_optimized is used when invoking collectstatic
-2. bok_choy is used when running CMS and LMS
-
 Note: it isn't possible to have a single settings file, because Django doesn't
 support both generating static assets to a directory and also serving static
 from the same directory.
diff --git a/cms/lib/spectacular.py b/cms/lib/spectacular.py
index d05d71353157..4318269bebcc 100644
--- a/cms/lib/spectacular.py
+++ b/cms/lib/spectacular.py
@@ -10,10 +10,12 @@ def cms_api_filter(endpoints):
     for (path, path_regex, method, callback) in endpoints:
         # Add only paths to the list that are part of the CMS API
         if (
-            path.startswith("/api/contentstore/v1/xblock") or
-            path.startswith("/api/contentstore/v1/videos") or
-            path.startswith("/api/contentstore/v1/video_transcripts") or
-            path.startswith("/api/contentstore/v1/file_assets")
+            # Don't just replace this with /v1 when switching to a later version of the CMS API.
+            # That would include some unintended endpoints.
+            path.startswith("/api/contentstore/v0/xblock") or
+            path.startswith("/api/contentstore/v0/videos") or
+            path.startswith("/api/contentstore/v0/video_transcripts") or
+            path.startswith("/api/contentstore/v0/file_assets")
         ):
             filtered.append((path, path_regex, method, callback))
     return filtered
diff --git a/cms/pytest.ini b/cms/pytest.ini
index 7f6e49c83e5b..c18bf1d66f31 100644
--- a/cms/pytest.ini
+++ b/cms/pytest.ini
@@ -12,6 +12,16 @@ filterwarnings =
     default
     ignore:No request passed to the backend, unable to rate-limit:UserWarning
     ignore::xblock.exceptions.FieldDataDeprecationWarning
+    # Remove default_app_config warning after updating Django to 4.2
+    ignore:.*You can remove default_app_config.*:PendingDeprecationWarning
+    # ABC deprecation Warning comes from libsass
+    ignore:Using or importing the ABCs from 'collections' instead of from 'collections.abc' is deprecated.*:DeprecationWarning:sass
+    # declare_namespace Warning comes from XBlock https://github.com/openedx/XBlock/issues/641
+    # and also due to dependency: https://github.com/PyFilesystem/pyfilesystem2
+    ignore:Deprecated call to `pkg_resources.declare_namespace.*:DeprecationWarning
+    ignore:.*pkg_resources is deprecated as an API.*:DeprecationWarning
+    ignore:'etree' is deprecated. Use 'xml.etree.ElementTree' instead.:DeprecationWarning:wiki
+
 norecursedirs = envs
 python_classes =
 python_files = test.py tests.py test_*.py *_tests.py
diff --git a/cms/static/js/i18n/eo/djangojs.js b/cms/static/js/i18n/eo/djangojs.js
index 5ef96bc3e679..8b51840c3712 100644
--- a/cms/static/js/i18n/eo/djangojs.js
+++ b/cms/static/js/i18n/eo/djangojs.js
@@ -132,8 +132,6 @@
     "Access to some content in this {blockType} is restricted to specific groups of learners.": "\u00c0\u00e7\u00e7\u00e9ss t\u00f6 s\u00f6m\u00e9 \u00e7\u00f6nt\u00e9nt \u00efn th\u00efs {blockType} \u00efs r\u00e9str\u00ef\u00e7t\u00e9d t\u00f6 sp\u00e9\u00e7\u00eff\u00ef\u00e7 gr\u00f6\u00fcps \u00f6f l\u00e9\u00e4rn\u00e9rs. \u2c60'\u03c3\u044f\u0454\u043c \u03b9\u03c1\u0455\u03c5\u043c \u2202\u03c3\u0142\u03c3\u044f \u0455\u03b9\u0442 \u03b1\u043c\u0454\u0442, \u00a2\u03c3\u03b7\u0455\u0454\u00a2\u0442\u0454#",
     "Access to this unit is restricted to: {selectedGroupsLabel}": "\u00c0\u00e7\u00e7\u00e9ss t\u00f6 th\u00efs \u00fcn\u00eft \u00efs r\u00e9str\u00ef\u00e7t\u00e9d t\u00f6: {selectedGroupsLabel} \u2c60'\u03c3\u044f\u0454\u043c \u03b9\u03c1\u0455\u03c5\u043c \u2202\u03c3\u0142\u03c3\u044f \u0455\u03b9\u0442 \u03b1\u043c\u0454\u0442, \u00a2\u03c3\u03b7\u0455\u0454\u00a2\u0442\u0454\u0442\u03c5\u044f #",
     "Access to this {blockType} is restricted to: {selectedGroupsLabel}": "\u00c0\u00e7\u00e7\u00e9ss t\u00f6 th\u00efs {blockType} \u00efs r\u00e9str\u00ef\u00e7t\u00e9d t\u00f6: {selectedGroupsLabel} \u2c60'\u03c3\u044f\u0454\u043c \u03b9\u03c1\u0455\u03c5\u043c \u2202\u03c3\u0142\u03c3\u044f \u0455\u03b9\u0442 \u03b1\u043c\u0454\u0442, \u00a2\u03c3\u03b7\u0455\u0454\u00a2\u0442\u0454\u0442\u03c5\u044f#",
-    "Accomplishments": "\u00c0\u00e7\u00e7\u00f6mpl\u00efshm\u00e9nts \u2c60'\u03c3\u044f\u0454\u043c \u03b9\u03c1\u0455\u03c5\u043c \u2202\u03c3\u0142\u03c3\u044f \u0455\u03b9\u0442 \u03b1#",
-    "Accomplishments Pagination": "\u00c0\u00e7\u00e7\u00f6mpl\u00efshm\u00e9nts P\u00e4g\u00efn\u00e4t\u00ef\u00f6n \u2c60'\u03c3\u044f\u0454\u043c \u03b9\u03c1\u0455\u03c5\u043c \u2202\u03c3\u0142\u03c3\u044f \u0455\u03b9\u0442 \u03b1\u043c\u0454\u0442, \u00a2\u03c3\u03b7\u0455#",
     "According to our records, you are not enrolled in any courses included in your {programName} program subscription. Enroll in a course from the {i_start}Program Details{i_end} page.": "\u00c0\u00e7\u00e7\u00f6rd\u00efng t\u00f6 \u00f6\u00fcr r\u00e9\u00e7\u00f6rds, \u00fd\u00f6\u00fc \u00e4r\u00e9 n\u00f6t \u00e9nr\u00f6ll\u00e9d \u00efn \u00e4n\u00fd \u00e7\u00f6\u00fcrs\u00e9s \u00efn\u00e7l\u00fcd\u00e9d \u00efn \u00fd\u00f6\u00fcr {programName} pr\u00f6gr\u00e4m s\u00fc\u00dfs\u00e7r\u00efpt\u00ef\u00f6n. \u00c9nr\u00f6ll \u00efn \u00e4 \u00e7\u00f6\u00fcrs\u00e9 fr\u00f6m th\u00e9 {i_start}Pr\u00f6gr\u00e4m D\u00e9t\u00e4\u00efls{i_end} p\u00e4g\u00e9. \u2c60'\u03c3\u044f\u0454\u043c \u03b9\u03c1\u0455\u03c5\u043c \u2202\u03c3\u0142\u03c3\u044f \u0455\u03b9\u0442 \u03b1\u043c\u0454\u0442, \u00a2\u03c3\u03b7\u0455\u0454\u00a2\u0442\u0454\u0442\u03c5\u044f \u03b1\u2202\u03b9\u03c1\u03b9\u0455\u03b9\u00a2\u03b9\u03b7g \u0454\u0142\u03b9\u0442, \u0455\u0454\u2202 \u2202\u03c3 \u0454\u03b9\u03c5\u0455\u043c\u03c3\u2202 \u0442\u0454\u043c\u03c1\u03c3\u044f \u03b9\u03b7\u00a2\u03b9\u2202\u03b9\u2202\u03c5\u03b7\u0442 \u03c5\u0442 \u0142\u03b1\u0432\u03c3\u044f\u0454 \u0454\u0442 \u2202\u03c3\u0142\u03c3\u044f\u0454 \u043c\u03b1g\u03b7\u03b1 \u03b1\u0142\u03b9q\u03c5\u03b1. \u03c5\u0442 \u0454\u03b7\u03b9\u043c \u03b1\u2202 \u043c\u03b9\u03b7\u03b9\u043c \u03bd\u0454\u03b7\u03b9\u03b1\u043c, q\u03c5\u03b9\u0455 \u03b7\u03c3\u0455\u0442\u044f\u03c5\u2202 \u0454\u03c7\u0454\u044f\u00a2\u03b9\u0442\u03b1\u0442\u03b9\u03c3\u03b7 \u03c5\u0142\u0142\u03b1\u043c\u00a2\u03c3 \u0142\u03b1\u0432\u03c3\u044f\u03b9\u0455 \u03b7\u03b9\u0455\u03b9 \u03c5\u0442 \u03b1\u0142\u03b9q\u03c5\u03b9\u03c1 \u0454\u03c7 \u0454\u03b1 \u00a2\u03c3\u043c\u043c\u03c3\u2202\u03c3 \u00a2\u03c3\u03b7\u0455\u0454q\u03c5\u03b1\u0442. \u2202\u03c5\u03b9\u0455 \u03b1\u03c5\u0442\u0454 \u03b9\u044f\u03c5\u044f\u0454 \u2202\u03c3\u0142\u03c3\u044f \u03b9\u03b7 \u044f\u0454\u03c1\u044f\u0454\u043d\u0454\u03b7\u2202\u0454\u044f\u03b9\u0442 \u03b9\u03b7 \u03bd\u03c3\u0142\u03c5\u03c1\u0442\u03b1\u0442\u0454 \u03bd\u0454\u0142\u03b9\u0442 \u0454\u0455\u0455\u0454 \u00a2\u03b9\u0142\u0142\u03c5\u043c \u2202\u03c3\u0142\u03c3\u044f\u0454 \u0454\u03c5 \u0192\u03c5g\u03b9\u03b1\u0442 \u03b7\u03c5\u0142\u0142\u03b1 \u03c1\u03b1\u044f\u03b9\u03b1\u0442\u03c5\u044f. \u0454\u03c7\u00a2\u0454\u03c1\u0442\u0454\u03c5\u044f \u0455\u03b9\u03b7\u0442 \u03c3\u00a2\u00a2\u03b1\u0454\u00a2\u03b1\u0442 \u00a2\u03c5\u03c1\u03b9\u2202\u03b1\u0442\u03b1\u0442 \u03b7\u03c3\u03b7 \u03c1\u044f\u03c3\u03b9\u2202\u0454\u03b7\u0442, \u0455\u03c5\u03b7\u0442 \u03b9\u03b7 \u00a2\u03c5\u0142\u03c1\u03b1 q\u03c5\u03b9 \u03c3\u0192\u0192\u03b9\u00a2\u03b9\u03b1 \u2202\u0454\u0455\u0454\u044f\u03c5#",
     "Account": "\u00c0\u00e7\u00e7\u00f6\u00fcnt \u2c60'\u03c3\u044f\u0454\u043c \u03b9\u03c1\u0455\u03c5\u043c #",
     "Account Information": "\u00c0\u00e7\u00e7\u00f6\u00fcnt \u00ccnf\u00f6rm\u00e4t\u00ef\u00f6n \u2c60'\u03c3\u044f\u0454\u043c \u03b9\u03c1\u0455\u03c5\u043c \u2202\u03c3\u0142\u03c3\u044f \u0455\u03b9\u0442 \u03b1\u043c\u0454\u0442,#",
@@ -538,7 +536,6 @@
     "Create a content group": "\u00c7r\u00e9\u00e4t\u00e9 \u00e4 \u00e7\u00f6nt\u00e9nt gr\u00f6\u00fcp \u2c60'\u03c3\u044f\u0454\u043c \u03b9\u03c1\u0455\u03c5\u043c \u2202\u03c3\u0142\u03c3\u044f \u0455\u03b9\u0442 \u03b1\u043c\u0454\u0442, \u00a2#",
     "Create a new team if you can't find an existing team to join, or if you would like to learn with friends you know.": "\u00c7r\u00e9\u00e4t\u00e9 \u00e4 n\u00e9w t\u00e9\u00e4m \u00eff \u00fd\u00f6\u00fc \u00e7\u00e4n't f\u00efnd \u00e4n \u00e9x\u00efst\u00efng t\u00e9\u00e4m t\u00f6 j\u00f6\u00efn, \u00f6r \u00eff \u00fd\u00f6\u00fc w\u00f6\u00fcld l\u00efk\u00e9 t\u00f6 l\u00e9\u00e4rn w\u00efth fr\u00ef\u00e9nds \u00fd\u00f6\u00fc kn\u00f6w. \u2c60'\u03c3\u044f\u0454\u043c \u03b9\u03c1\u0455\u03c5\u043c \u2202\u03c3\u0142#",
     "Create a report of problem responses": "\u00c7r\u00e9\u00e4t\u00e9 \u00e4 r\u00e9p\u00f6rt \u00f6f pr\u00f6\u00dfl\u00e9m r\u00e9sp\u00f6ns\u00e9s \u2c60'\u03c3\u044f\u0454\u043c \u03b9\u03c1\u0455\u03c5\u043c \u2202\u03c3\u0142\u03c3\u044f \u0455\u03b9\u0442 \u03b1\u043c\u0454\u0442, \u00a2\u03c3\u03b7\u0455\u0454\u00a2\u0442\u0454\u0442\u03c5#",
-    "Create a {link_start}Mozilla Backpack{link_end} account, or log in to your existing account": "\u00c7r\u00e9\u00e4t\u00e9 \u00e4 {link_start}M\u00f6z\u00efll\u00e4 B\u00e4\u00e7kp\u00e4\u00e7k{link_end} \u00e4\u00e7\u00e7\u00f6\u00fcnt, \u00f6r l\u00f6g \u00efn t\u00f6 \u00fd\u00f6\u00fcr \u00e9x\u00efst\u00efng \u00e4\u00e7\u00e7\u00f6\u00fcnt \u2c60'\u03c3\u044f\u0454\u043c \u03b9\u03c1\u0455\u03c5\u043c \u2202\u03c3\u0142\u03c3\u044f \u0455\u03b9\u0442 \u03b1\u043c\u0454\u0442, \u00a2\u03c3\u03b7\u0455\u0454\u00a2\u0442\u0454\u0442\u03c5#",
     "Create account using %(providerName)s.": "\u00c7r\u00e9\u00e4t\u00e9 \u00e4\u00e7\u00e7\u00f6\u00fcnt \u00fcs\u00efng %(providerName)s. \u2c60'\u03c3\u044f\u0454\u043c \u03b9\u03c1\u0455\u03c5\u043c \u2202\u03c3\u0142\u03c3\u044f \u0455\u03b9\u0442 \u03b1\u043c\u0454\u0442, \u00a2\u03c3\u03b7\u0455#",
     "Create an Account": "\u00c7r\u00e9\u00e4t\u00e9 \u00e4n \u00c0\u00e7\u00e7\u00f6\u00fcnt \u2c60'\u03c3\u044f\u0454\u043c \u03b9\u03c1\u0455\u03c5\u043c \u2202\u03c3\u0142\u03c3\u044f \u0455\u03b9\u0442 \u03b1\u043c\u0454#",
     "Create an Account.": "\u00c7r\u00e9\u00e4t\u00e9 \u00e4n \u00c0\u00e7\u00e7\u00f6\u00fcnt. \u2c60'\u03c3\u044f\u0454\u043c \u03b9\u03c1\u0455\u03c5\u043c \u2202\u03c3\u0142\u03c3\u044f \u0455\u03b9\u0442 \u03b1\u043c\u0454\u0442#",
@@ -651,7 +648,6 @@
     "Duplicate": "D\u00fcpl\u00ef\u00e7\u00e4t\u00e9 \u2c60'\u03c3\u044f\u0454\u043c \u03b9\u03c1\u0455\u03c5\u043c \u2202\u03c3\u0142#",
     "Duplicating": "D\u00fcpl\u00ef\u00e7\u00e4t\u00efng \u2c60'\u03c3\u044f\u0454\u043c \u03b9\u03c1\u0455\u03c5\u043c \u2202\u03c3\u0142\u03c3\u044f #",
     "Duration (sec)": "D\u00fcr\u00e4t\u00ef\u00f6n (s\u00e9\u00e7) \u2c60'\u03c3\u044f\u0454\u043c \u03b9\u03c1\u0455\u03c5\u043c \u2202\u03c3\u0142\u03c3\u044f \u0455\u03b9\u0442#",
-    "Earned %(created)s.": "\u00c9\u00e4rn\u00e9d %(created)s. \u2c60'\u03c3\u044f\u0454\u043c \u03b9\u03c1\u0455\u03c5\u043c \u2202\u03c3\u0142\u03c3\u044f #",
     "Earned Certificates": "\u00c9\u00e4rn\u00e9d \u00c7\u00e9rt\u00eff\u00ef\u00e7\u00e4t\u00e9s \u2c60'\u03c3\u044f\u0454\u043c \u03b9\u03c1\u0455\u03c5\u043c \u2202\u03c3\u0142\u03c3\u044f \u0455\u03b9\u0442 \u03b1\u043c\u0454\u0442,#",
     "EdX doesn't have a timed transcript for this video in Studio, but we found a transcript on YouTube. You can import the YouTube transcript or upload your own .srt transcript file.": "\u00c9dX d\u00f6\u00e9sn't h\u00e4v\u00e9 \u00e4 t\u00efm\u00e9d tr\u00e4ns\u00e7r\u00efpt f\u00f6r th\u00efs v\u00efd\u00e9\u00f6 \u00efn St\u00fcd\u00ef\u00f6, \u00df\u00fct w\u00e9 f\u00f6\u00fcnd \u00e4 tr\u00e4ns\u00e7r\u00efpt \u00f6n \u00dd\u00f6\u00fcT\u00fc\u00df\u00e9. \u00dd\u00f6\u00fc \u00e7\u00e4n \u00efmp\u00f6rt th\u00e9 \u00dd\u00f6\u00fcT\u00fc\u00df\u00e9 tr\u00e4ns\u00e7r\u00efpt \u00f6r \u00fcpl\u00f6\u00e4d \u00fd\u00f6\u00fcr \u00f6wn .srt tr\u00e4ns\u00e7r\u00efpt f\u00efl\u00e9. \u2c60'\u03c3\u044f\u0454\u043c \u03b9\u03c1\u0455\u03c5\u043c \u2202\u03c3\u0142\u03c3\u044f \u0455\u03b9\u0442 \u03b1\u043c\u0454\u0442, \u00a2\u03c3\u03b7\u0455\u0454\u00a2\u0442\u0454\u0442\u03c5\u044f \u03b1\u2202\u03b9\u03c1\u03b9\u0455\u03b9\u00a2\u03b9\u03b7g \u0454\u0142\u03b9\u0442, \u0455\u0454\u2202 \u2202\u03c3 \u0454\u03b9\u03c5\u0455\u043c\u03c3\u2202 \u0442\u0454\u043c\u03c1\u03c3\u044f \u03b9\u03b7\u00a2\u03b9\u2202\u03b9\u2202\u03c5\u03b7\u0442 \u03c5\u0442 \u0142\u03b1\u0432\u03c3\u044f\u0454 \u0454\u0442 \u2202\u03c3\u0142\u03c3\u044f\u0454 \u043c\u03b1g\u03b7\u03b1 \u03b1\u0142\u03b9q\u03c5\u03b1. \u03c5\u0442 \u0454\u03b7\u03b9\u043c \u03b1\u2202 \u043c\u03b9\u03b7\u03b9\u043c \u03bd\u0454\u03b7\u03b9\u03b1\u043c, q\u03c5\u03b9\u0455 \u03b7\u03c3\u0455\u0442\u044f\u03c5\u2202 \u0454\u03c7\u0454\u044f\u00a2\u03b9\u0442\u03b1\u0442\u03b9\u03c3\u03b7 \u03c5\u0142\u0142\u03b1\u043c\u00a2\u03c3 \u0142\u03b1\u0432\u03c3\u044f\u03b9\u0455 \u03b7\u03b9\u0455\u03b9 \u03c5\u0442 \u03b1\u0142\u03b9q\u03c5\u03b9\u03c1 \u0454\u03c7 \u0454\u03b1 \u00a2\u03c3\u043c\u043c\u03c3\u2202\u03c3 \u00a2\u03c3\u03b7\u0455\u0454q\u03c5\u03b1\u0442. \u2202\u03c5\u03b9\u0455 \u03b1\u03c5\u0442\u0454 \u03b9\u044f\u03c5\u044f\u0454 \u2202\u03c3\u0142\u03c3\u044f \u03b9\u03b7 \u044f\u0454\u03c1\u044f\u0454\u043d\u0454\u03b7\u2202\u0454\u044f\u03b9\u0442 \u03b9\u03b7 \u03bd\u03c3\u0142\u03c5\u03c1\u0442\u03b1\u0442\u0454 \u03bd\u0454\u0142\u03b9\u0442 \u0454\u0455\u0455\u0454 \u00a2\u03b9\u0142\u0142\u03c5\u043c \u2202\u03c3\u0142\u03c3\u044f\u0454 \u0454\u03c5 \u0192\u03c5g\u03b9\u03b1\u0442 \u03b7\u03c5\u0142\u0142\u03b1 \u03c1\u03b1\u044f\u03b9\u03b1\u0442\u03c5\u044f. \u0454\u03c7\u00a2\u0454\u03c1\u0442\u0454\u03c5\u044f \u0455\u03b9\u03b7\u0442 \u03c3\u00a2\u00a2\u03b1\u0454\u00a2\u03b1\u0442 \u00a2\u03c5\u03c1\u03b9\u2202\u03b1\u0442\u03b1\u0442 \u03b7\u03c3\u03b7 \u03c1\u044f\u03c3\u03b9\u2202\u0454\u03b7\u0442, \u0455\u03c5\u03b7\u0442 \u03b9\u03b7 #",
     "EdX doesn\\'t have a timed transcript for this video. Please upload an .srt file.": "\u00c9dX d\u00f6\u00e9sn\\'t h\u00e4v\u00e9 \u00e4 t\u00efm\u00e9d tr\u00e4ns\u00e7r\u00efpt f\u00f6r th\u00efs v\u00efd\u00e9\u00f6. Pl\u00e9\u00e4s\u00e9 \u00fcpl\u00f6\u00e4d \u00e4n .srt f\u00efl\u00e9. \u2c60'\u03c3\u044f\u0454\u043c \u03b9\u03c1\u0455\u03c5\u043c \u2202\u03c3\u0142\u03c3\u044f \u0455\u03b9\u0442 \u03b1\u043c\u0454\u0442, \u00a2\u03c3\u03b7\u0455\u0454\u00a2\u0442\u0454#",
@@ -823,7 +819,6 @@
     "Financial Assistance": "F\u00efn\u00e4n\u00e7\u00ef\u00e4l \u00c0ss\u00efst\u00e4n\u00e7\u00e9 \u2c60'\u03c3\u044f\u0454\u043c \u03b9\u03c1\u0455\u03c5\u043c \u2202\u03c3\u0142\u03c3\u044f \u0455\u03b9\u0442 \u03b1\u043c\u0454\u0442, #",
     "Financial Assistance Application": "F\u00efn\u00e4n\u00e7\u00ef\u00e4l \u00c0ss\u00efst\u00e4n\u00e7\u00e9 \u00c0ppl\u00ef\u00e7\u00e4t\u00ef\u00f6n \u2c60'\u03c3\u044f\u0454\u043c \u03b9\u03c1\u0455\u03c5\u043c \u2202\u03c3\u0142\u03c3\u044f \u0455\u03b9\u0442 \u03b1\u043c\u0454\u0442, \u00a2\u03c3\u03b7\u0455\u0454\u00a2\u0442\u0454#",
     "Find": "F\u00efnd \u2c60'\u03c3\u044f\u0454\u043c \u03b9#",
-    "Find a course": "F\u00efnd \u00e4 \u00e7\u00f6\u00fcrs\u00e9 \u2c60'\u03c3\u044f\u0454\u043c \u03b9\u03c1\u0455\u03c5\u043c \u2202\u03c3\u0142\u03c3\u044f \u0455\u03b9#",
     "Find and replace": "F\u00efnd \u00e4nd r\u00e9pl\u00e4\u00e7\u00e9 \u2c60'\u03c3\u044f\u0454\u043c \u03b9\u03c1\u0455\u03c5\u043c \u2202\u03c3\u0142\u03c3\u044f \u0455\u03b9\u0442 \u03b1\u043c#",
     "Find answers to the top questions asked by learners.": "F\u00efnd \u00e4nsw\u00e9rs t\u00f6 th\u00e9 t\u00f6p q\u00fc\u00e9st\u00ef\u00f6ns \u00e4sk\u00e9d \u00df\u00fd l\u00e9\u00e4rn\u00e9rs. \u2c60'\u03c3\u044f\u0454\u043c \u03b9\u03c1\u0455\u03c5\u043c \u2202\u03c3\u0142\u03c3\u044f \u0455\u03b9\u0442 \u03b1\u043c\u0454\u0442, \u00a2\u03c3\u03b7\u0455\u0454\u00a2\u0442\u0454\u0442\u03c5\u044f \u03b1#",
     "Find discussions": "F\u00efnd d\u00efs\u00e7\u00fcss\u00ef\u00f6ns \u2c60'\u03c3\u044f\u0454\u043c \u03b9\u03c1\u0455\u03c5\u043c \u2202\u03c3\u0142\u03c3\u044f \u0455\u03b9\u0442 \u03b1\u043c#",
@@ -1576,10 +1571,7 @@
     "Settings": "S\u00e9tt\u00efngs \u2c60'\u03c3\u044f\u0454\u043c \u03b9\u03c1\u0455\u03c5\u043c \u2202#",
     "Settings updated": "S\u00e9tt\u00efngs \u00fcpd\u00e4t\u00e9d \u2c60'\u03c3\u044f\u0454\u043c \u03b9\u03c1\u0455\u03c5\u043c \u2202\u03c3\u0142\u03c3\u044f \u0455\u03b9\u0442 \u03b1\u043c#",
     "Setup Started": "S\u00e9t\u00fcp St\u00e4rt\u00e9d \u2c60'\u03c3\u044f\u0454\u043c \u03b9\u03c1\u0455\u03c5\u043c \u2202\u03c3\u0142\u03c3\u044f \u0455\u03b9#",
-    "Share": "Sh\u00e4r\u00e9 \u2c60'\u03c3\u044f\u0454\u043c \u03b9\u03c1\u0455#",
     "Share Alike": "Sh\u00e4r\u00e9 \u00c0l\u00efk\u00e9 \u2c60'\u03c3\u044f\u0454\u043c \u03b9\u03c1\u0455\u03c5\u043c \u2202\u03c3\u0142\u03c3\u044f #",
-    "Share on Mozilla Backpack": "Sh\u00e4r\u00e9 \u00f6n M\u00f6z\u00efll\u00e4 B\u00e4\u00e7kp\u00e4\u00e7k \u2c60'\u03c3\u044f\u0454\u043c \u03b9\u03c1\u0455\u03c5\u043c \u2202\u03c3\u0142\u03c3\u044f \u0455\u03b9\u0442 \u03b1\u043c\u0454\u0442, \u00a2\u03c3\u03b7\u0455#",
-    "Share your \"%(display_name)s\" award": "Sh\u00e4r\u00e9 \u00fd\u00f6\u00fcr \"%(display_name)s\" \u00e4w\u00e4rd \u2c60'\u03c3\u044f\u0454\u043c \u03b9\u03c1\u0455\u03c5\u043c \u2202\u03c3\u0142\u03c3\u044f \u0455\u03b9\u0442 \u03b1\u043c\u0454\u0442, \u00a2#",
     "Short explanation": "Sh\u00f6rt \u00e9xpl\u00e4n\u00e4t\u00ef\u00f6n \u2c60'\u03c3\u044f\u0454\u043c \u03b9\u03c1\u0455\u03c5\u043c \u2202\u03c3\u0142\u03c3\u044f \u0455\u03b9\u0442 \u03b1\u043c\u0454#",
     "Show": "Montru",
     "Show All": "Sh\u00f6w \u00c0ll \u2c60'\u03c3\u044f\u0454\u043c \u03b9\u03c1\u0455\u03c5\u043c \u2202#",
@@ -1666,7 +1658,6 @@
     "Start of transcript. Skip to the end.": "St\u00e4rt \u00f6f tr\u00e4ns\u00e7r\u00efpt. Sk\u00efp t\u00f6 th\u00e9 \u00e9nd. \u2c60'\u03c3\u044f\u0454\u043c \u03b9\u03c1\u0455\u03c5\u043c \u2202\u03c3\u0142\u03c3\u044f \u0455\u03b9\u0442 \u03b1\u043c\u0454\u0442, \u00a2\u03c3\u03b7\u0455\u0454\u00a2\u0442\u0454\u0442\u03c5#",
     "Start regenerating certificates for students in this course?": "St\u00e4rt r\u00e9g\u00e9n\u00e9r\u00e4t\u00efng \u00e7\u00e9rt\u00eff\u00ef\u00e7\u00e4t\u00e9s f\u00f6r st\u00fcd\u00e9nts \u00efn th\u00efs \u00e7\u00f6\u00fcrs\u00e9? \u2c60'\u03c3\u044f\u0454\u043c \u03b9\u03c1\u0455\u03c5\u043c \u2202\u03c3\u0142\u03c3\u044f \u0455\u03b9\u0442 \u03b1\u043c\u0454\u0442, \u00a2\u03c3\u03b7\u0455\u0454\u00a2\u0442\u0454\u0442\u03c5\u044f \u03b1#",
     "Start search": "St\u00e4rt s\u00e9\u00e4r\u00e7h \u2c60'\u03c3\u044f\u0454\u043c \u03b9\u03c1\u0455\u03c5\u043c \u2202\u03c3\u0142\u03c3\u044f \u0455#",
-    "Start working toward your next learning goal.": "St\u00e4rt w\u00f6rk\u00efng t\u00f6w\u00e4rd \u00fd\u00f6\u00fcr n\u00e9xt l\u00e9\u00e4rn\u00efng g\u00f6\u00e4l. \u2c60'\u03c3\u044f\u0454\u043c \u03b9\u03c1\u0455\u03c5\u043c \u2202\u03c3\u0142\u03c3\u044f \u0455\u03b9\u0442 \u03b1\u043c\u0454\u0442, \u00a2\u03c3\u03b7\u0455\u0454\u00a2\u0442\u0454\u0442\u03c5\u044f #",
     "Start {trialLength}-day free trial": "St\u00e4rt {trialLength}-d\u00e4\u00fd fr\u00e9\u00e9 tr\u00ef\u00e4l \u2c60'\u03c3\u044f\u0454\u043c \u03b9\u03c1\u0455\u03c5\u043c \u2202\u03c3\u0142\u03c3\u044f \u0455\u03b9\u0442 \u03b1\u043c\u0454\u0442, \u00a2\u03c3\u03b7#",
     "Started": "St\u00e4rt\u00e9d \u2c60'\u03c3\u044f\u0454\u043c \u03b9\u03c1\u0455\u03c5\u043c #",
     "Started entrance exam rescore task for student '{student_id}'. Click the 'Show Task Status' button to see the status of the task.": "St\u00e4rt\u00e9d \u00e9ntr\u00e4n\u00e7\u00e9 \u00e9x\u00e4m r\u00e9s\u00e7\u00f6r\u00e9 t\u00e4sk f\u00f6r st\u00fcd\u00e9nt '{student_id}'. \u00c7l\u00ef\u00e7k th\u00e9 'Sh\u00f6w T\u00e4sk St\u00e4t\u00fcs' \u00df\u00fctt\u00f6n t\u00f6 s\u00e9\u00e9 th\u00e9 st\u00e4t\u00fcs \u00f6f th\u00e9 t\u00e4sk. \u2c60'\u03c3\u044f\u0454\u043c \u03b9\u03c1\u0455\u03c5#",
@@ -1976,7 +1967,6 @@
     "To receive a certificate, you must also verify your identity.": "T\u00f6 r\u00e9\u00e7\u00e9\u00efv\u00e9 \u00e4 \u00e7\u00e9rt\u00eff\u00ef\u00e7\u00e4t\u00e9, \u00fd\u00f6\u00fc m\u00fcst \u00e4ls\u00f6 v\u00e9r\u00eff\u00fd \u00fd\u00f6\u00fcr \u00efd\u00e9nt\u00eft\u00fd. \u2c60'\u03c3\u044f\u0454\u043c \u03b9\u03c1\u0455\u03c5\u043c \u2202\u03c3\u0142\u03c3\u044f \u0455\u03b9\u0442 \u03b1\u043c\u0454\u0442, \u00a2\u03c3\u03b7\u0455\u0454\u00a2\u0442\u0454\u0442\u03c5\u044f \u03b1#",
     "To receive credit for problems, you must select \"Submit\" for each problem before you select \"End My Exam\".": "T\u00f6 r\u00e9\u00e7\u00e9\u00efv\u00e9 \u00e7r\u00e9d\u00eft f\u00f6r pr\u00f6\u00dfl\u00e9ms, \u00fd\u00f6\u00fc m\u00fcst s\u00e9l\u00e9\u00e7t \"S\u00fc\u00dfm\u00eft\" f\u00f6r \u00e9\u00e4\u00e7h pr\u00f6\u00dfl\u00e9m \u00df\u00e9f\u00f6r\u00e9 \u00fd\u00f6\u00fc s\u00e9l\u00e9\u00e7t \"\u00c9nd M\u00fd \u00c9x\u00e4m\". \u2c60'\u03c3\u044f\u0454\u043c \u03b9\u03c1\u0455\u03c5\u043c \u2202\u03c3\u0142\u03c3\u044f \u0455\u03b9\u0442 #",
     "To review learner cohort assignments or see the results of uploading a CSV file, download course profile information or cohort results on the {link_start}Data Download{link_end} page.": "T\u00f6 r\u00e9v\u00ef\u00e9w l\u00e9\u00e4rn\u00e9r \u00e7\u00f6h\u00f6rt \u00e4ss\u00efgnm\u00e9nts \u00f6r s\u00e9\u00e9 th\u00e9 r\u00e9s\u00fclts \u00f6f \u00fcpl\u00f6\u00e4d\u00efng \u00e4 \u00c7SV f\u00efl\u00e9, d\u00f6wnl\u00f6\u00e4d \u00e7\u00f6\u00fcrs\u00e9 pr\u00f6f\u00efl\u00e9 \u00efnf\u00f6rm\u00e4t\u00ef\u00f6n \u00f6r \u00e7\u00f6h\u00f6rt r\u00e9s\u00fclts \u00f6n th\u00e9 {link_start}D\u00e4t\u00e4 D\u00f6wnl\u00f6\u00e4d{link_end} p\u00e4g\u00e9. \u2c60'\u03c3\u044f\u0454\u043c \u03b9\u03c1\u0455\u03c5\u043c \u2202\u03c3\u0142\u03c3\u044f \u0455\u03b9\u0442 \u03b1\u043c\u0454\u0442, \u00a2\u03c3\u03b7\u0455\u0454\u00a2\u0442\u0454\u0442\u03c5\u044f \u03b1\u2202\u03b9\u03c1\u03b9\u0455\u03b9\u00a2\u03b9\u03b7g \u0454\u0142\u03b9\u0442, \u0455\u0454\u2202 \u2202\u03c3 \u0454\u03b9\u03c5\u0455\u043c\u03c3\u2202 \u0442\u0454\u043c\u03c1\u03c3\u044f \u03b9\u03b7\u00a2\u03b9\u2202\u03b9\u2202\u03c5\u03b7\u0442 \u03c5\u0442 \u0142\u03b1\u0432\u03c3\u044f\u0454 \u0454\u0442 \u2202\u03c3\u0142\u03c3\u044f\u0454 \u043c\u03b1g\u03b7\u03b1 \u03b1\u0142\u03b9q\u03c5\u03b1. \u03c5\u0442 \u0454\u03b7\u03b9\u043c \u03b1\u2202 \u043c\u03b9\u03b7\u03b9\u043c \u03bd\u0454\u03b7\u03b9\u03b1\u043c, q\u03c5\u03b9\u0455 \u03b7\u03c3\u0455\u0442\u044f\u03c5\u2202 \u0454\u03c7\u0454\u044f\u00a2\u03b9\u0442\u03b1\u0442\u03b9\u03c3\u03b7 \u03c5\u0142\u0142\u03b1\u043c\u00a2\u03c3 \u0142\u03b1\u0432\u03c3\u044f\u03b9\u0455 \u03b7\u03b9\u0455\u03b9 \u03c5\u0442 \u03b1\u0142\u03b9q\u03c5\u03b9\u03c1 \u0454\u03c7 \u0454\u03b1 \u00a2\u03c3\u043c\u043c\u03c3\u2202\u03c3 \u00a2\u03c3\u03b7\u0455\u0454q\u03c5\u03b1\u0442. \u2202\u03c5\u03b9\u0455 \u03b1\u03c5\u0442\u0454 \u03b9\u044f\u03c5\u044f\u0454 \u2202\u03c3\u0142\u03c3\u044f \u03b9\u03b7 \u044f\u0454\u03c1\u044f\u0454\u043d\u0454\u03b7\u2202\u0454\u044f\u03b9\u0442 \u03b9\u03b7 \u03bd\u03c3\u0142\u03c5\u03c1\u0442\u03b1\u0442\u0454 \u03bd\u0454\u0142\u03b9\u0442 \u0454\u0455\u0455\u0454 \u00a2\u03b9\u0142\u0142\u03c5\u043c \u2202\u03c3\u0142\u03c3\u044f\u0454 \u0454\u03c5 \u0192\u03c5g\u03b9\u03b1\u0442 \u03b7\u03c5\u0142\u0142\u03b1 \u03c1\u03b1\u044f\u03b9\u03b1\u0442\u03c5\u044f. \u0454\u03c7\u00a2\u0454\u03c1\u0442\u0454\u03c5\u044f \u0455\u03b9\u03b7\u0442 \u03c3\u00a2\u00a2\u03b1\u0454\u00a2\u03b1\u0442 \u00a2\u03c5\u03c1\u03b9\u2202\u03b1\u0442\u03b1\u0442 \u03b7\u03c3\u03b7 \u03c1\u044f\u03c3\u03b9\u2202\u0454\u03b7\u0442, \u0455\u03c5\u03b7\u0442 \u03b9\u03b7 \u00a2\u03c5\u0142\u03c1\u03b1 q\u03c5\u03b9 \u03c3\u0192\u0192\u03b9\u00a2#",
-    "To share your certificate on Mozilla Backpack, you must first have a Backpack account. Complete the following steps to add your certificate to Backpack.": "T\u00f6 sh\u00e4r\u00e9 \u00fd\u00f6\u00fcr \u00e7\u00e9rt\u00eff\u00ef\u00e7\u00e4t\u00e9 \u00f6n M\u00f6z\u00efll\u00e4 B\u00e4\u00e7kp\u00e4\u00e7k, \u00fd\u00f6\u00fc m\u00fcst f\u00efrst h\u00e4v\u00e9 \u00e4 B\u00e4\u00e7kp\u00e4\u00e7k \u00e4\u00e7\u00e7\u00f6\u00fcnt. \u00c7\u00f6mpl\u00e9t\u00e9 th\u00e9 f\u00f6ll\u00f6w\u00efng st\u00e9ps t\u00f6 \u00e4dd \u00fd\u00f6\u00fcr \u00e7\u00e9rt\u00eff\u00ef\u00e7\u00e4t\u00e9 t\u00f6 B\u00e4\u00e7kp\u00e4\u00e7k. \u2c60'\u03c3\u044f\u0454\u043c \u03b9\u03c1\u0455\u03c5\u043c \u2202\u03c3\u0142\u03c3\u044f \u0455\u03b9\u0442 \u03b1\u043c\u0454\u0442, \u00a2\u03c3\u03b7\u0455\u0454\u00a2\u0442\u0454\u0442\u03c5\u044f \u03b1\u2202\u03b9\u03c1\u03b9\u0455\u03b9\u00a2\u03b9\u03b7g \u0454\u0142\u03b9\u0442, \u0455\u0454\u2202 \u2202\u03c3 \u0454\u03b9\u03c5\u0455\u043c\u03c3\u2202 \u0442\u0454\u043c\u03c1\u03c3\u044f \u03b9\u03b7\u00a2\u03b9\u2202\u03b9\u2202\u03c5\u03b7\u0442 \u03c5\u0442 \u0142\u03b1\u0432\u03c3\u044f\u0454 \u0454\u0442 \u2202\u03c3\u0142\u03c3\u044f\u0454 \u043c\u03b1g\u03b7\u03b1 \u03b1\u0142\u03b9q\u03c5\u03b1. \u03c5\u0442 \u0454\u03b7\u03b9\u043c \u03b1\u2202 \u043c\u03b9\u03b7\u03b9\u043c \u03bd\u0454\u03b7\u03b9\u03b1\u043c, q\u03c5\u03b9\u0455 \u03b7\u03c3\u0455\u0442\u044f\u03c5\u2202 \u0454\u03c7\u0454\u044f\u00a2\u03b9\u0442\u03b1\u0442\u03b9\u03c3\u03b7 \u03c5\u0142\u0142\u03b1\u043c\u00a2\u03c3 \u0142\u03b1\u0432\u03c3\u044f\u03b9\u0455 \u03b7\u03b9\u0455\u03b9 \u03c5\u0442 \u03b1\u0142\u03b9q\u03c5\u03b9\u03c1 \u0454\u03c7 \u0454\u03b1 \u00a2\u03c3\u043c\u043c\u03c3\u2202\u03c3 \u00a2\u03c3\u03b7\u0455\u0454q\u03c5\u03b1\u0442. \u2202\u03c5\u03b9\u0455 \u03b1\u03c5\u0442\u0454 \u03b9\u044f\u03c5\u044f\u0454 \u2202\u03c3\u0142\u03c3\u044f \u03b9\u03b7 \u044f\u0454\u03c1\u044f\u0454\u043d\u0454\u03b7\u2202\u0454\u044f\u03b9\u0442 \u03b9\u03b7 \u03bd\u03c3\u0142\u03c5\u03c1\u0442\u03b1\u0442\u0454 \u03bd\u0454\u0142\u03b9\u0442 \u0454\u0455\u0455\u0454 \u00a2\u03b9\u0142\u0142\u03c5\u043c \u2202\u03c3\u0142\u03c3\u044f\u0454 \u0454\u03c5 \u0192\u03c5g\u03b9\u03b1\u0442 \u03b7\u03c5\u0142\u0142\u03b1 \u03c1\u03b1\u044f\u03b9\u03b1\u0442\u03c5\u044f. \u0454\u03c7\u00a2\u0454\u03c1\u0442\u0454\u03c5\u044f \u0455\u03b9\u03b7\u0442 \u03c3\u00a2\u00a2\u03b1\u0454\u00a2\u03b1\u0442 \u00a2\u03c5\u03c1\u03b9\u2202\u03b1\u0442\u03b1\u0442 \u03b7\u03c3\u03b7 \u03c1\u044f\u03c3\u03b9\u2202\u0454\u03b7\u0442, \u0455\u03c5\u03b7\u0442 \u03b9\u03b7 \u00a2\u03c5\u0142\u03c1\u03b1 q\u03c5\u03b9 \u03c3\u0192\u0192\u03b9\u00a2\u03b9\u03b1 \u2202\u0454\u0455\u0454\u044f\u03c5\u03b7\u0442 \u043c\u03c3\u0142\u0142\u03b9\u0442#",
     "To take a successful photo, make sure that:": "T\u00f6 t\u00e4k\u00e9 \u00e4 s\u00fc\u00e7\u00e7\u00e9ssf\u00fcl ph\u00f6t\u00f6, m\u00e4k\u00e9 s\u00fcr\u00e9 th\u00e4t: \u2c60'\u03c3\u044f\u0454\u043c \u03b9\u03c1\u0455\u03c5\u043c \u2202\u03c3\u0142\u03c3\u044f \u0455\u03b9\u0442 \u03b1\u043c\u0454\u0442, \u00a2\u03c3\u03b7\u0455\u0454\u00a2\u0442\u0454\u0442\u03c5\u044f #",
     "To take the photo of your face, click on the camera button {icon}. If you need to try again, click 'Retake Photo'.": "T\u00f6 t\u00e4k\u00e9 th\u00e9 ph\u00f6t\u00f6 \u00f6f \u00fd\u00f6\u00fcr f\u00e4\u00e7\u00e9, \u00e7l\u00ef\u00e7k \u00f6n th\u00e9 \u00e7\u00e4m\u00e9r\u00e4 \u00df\u00fctt\u00f6n {icon}. \u00ccf \u00fd\u00f6\u00fc n\u00e9\u00e9d t\u00f6 tr\u00fd \u00e4g\u00e4\u00efn, \u00e7l\u00ef\u00e7k 'R\u00e9t\u00e4k\u00e9 Ph\u00f6t\u00f6'. \u2c60'\u03c3\u044f\u0454\u043c \u03b9\u03c1\u0455\u03c5\u043c \u2202\u03c3\u0142\u03c3\u044f #",
     "To verify your identity, you need a webcam and a government-issued photo ID.": "T\u00f6 v\u00e9r\u00eff\u00fd \u00fd\u00f6\u00fcr \u00efd\u00e9nt\u00eft\u00fd, \u00fd\u00f6\u00fc n\u00e9\u00e9d \u00e4 w\u00e9\u00df\u00e7\u00e4m \u00e4nd \u00e4 g\u00f6v\u00e9rnm\u00e9nt-\u00efss\u00fc\u00e9d ph\u00f6t\u00f6 \u00ccD. \u2c60'\u03c3\u044f\u0454\u043c \u03b9\u03c1\u0455\u03c5\u043c \u2202\u03c3\u0142\u03c3\u044f \u0455\u03b9\u0442 \u03b1\u043c\u0454\u0442, \u00a2\u03c3\u03b7\u0455\u0454\u00a2\u0442\u0454\u0442\u03c5#",
@@ -2216,7 +2206,6 @@
     "What if I have difficulty holding my ID in position relative to the camera?": "Wh\u00e4t \u00eff \u00cc h\u00e4v\u00e9 d\u00efff\u00ef\u00e7\u00fclt\u00fd h\u00f6ld\u00efng m\u00fd \u00ccD \u00efn p\u00f6s\u00eft\u00ef\u00f6n r\u00e9l\u00e4t\u00efv\u00e9 t\u00f6 th\u00e9 \u00e7\u00e4m\u00e9r\u00e4? \u2c60'\u03c3\u044f\u0454\u043c \u03b9\u03c1\u0455\u03c5\u043c \u2202\u03c3\u0142\u03c3\u044f \u0455\u03b9\u0442 \u03b1\u043c\u0454\u0442, \u00a2\u03c3\u03b7\u0455\u0454\u00a2\u0442\u0454\u0442\u03c5#",
     "What if I have difficulty holding my head in position relative to the camera?": "Wh\u00e4t \u00eff \u00cc h\u00e4v\u00e9 d\u00efff\u00ef\u00e7\u00fclt\u00fd h\u00f6ld\u00efng m\u00fd h\u00e9\u00e4d \u00efn p\u00f6s\u00eft\u00ef\u00f6n r\u00e9l\u00e4t\u00efv\u00e9 t\u00f6 th\u00e9 \u00e7\u00e4m\u00e9r\u00e4? \u2c60'\u03c3\u044f\u0454\u043c \u03b9\u03c1\u0455\u03c5\u043c \u2202\u03c3\u0142\u03c3\u044f \u0455\u03b9\u0442 \u03b1\u043c\u0454\u0442, \u00a2\u03c3\u03b7\u0455\u0454\u00a2\u0442\u0454\u0442#",
     "What was the total combined income, during the last 12 months, of all members of your family? ": "Wh\u00e4t w\u00e4s th\u00e9 t\u00f6t\u00e4l \u00e7\u00f6m\u00df\u00efn\u00e9d \u00efn\u00e7\u00f6m\u00e9, d\u00fcr\u00efng th\u00e9 l\u00e4st 12 m\u00f6nths, \u00f6f \u00e4ll m\u00e9m\u00df\u00e9rs \u00f6f \u00fd\u00f6\u00fcr f\u00e4m\u00efl\u00fd?  \u2c60'\u03c3\u044f\u0454\u043c \u03b9\u03c1\u0455\u03c5\u043c \u2202\u03c3\u0142\u03c3\u044f \u0455\u03b9\u0442 \u03b1\u043c\u0454\u0442, \u00a2#",
-    "What's Your Next Accomplishment?": "Wh\u00e4t's \u00dd\u00f6\u00fcr N\u00e9xt \u00c0\u00e7\u00e7\u00f6mpl\u00efshm\u00e9nt? \u2c60'\u03c3\u044f\u0454\u043c \u03b9\u03c1\u0455\u03c5\u043c \u2202\u03c3\u0142\u03c3\u044f \u0455\u03b9\u0442 \u03b1\u043c\u0454\u0442, \u00a2\u03c3\u03b7\u0455\u0454\u00a2\u0442\u0454#",
     "What's in my clipboard?": "Wh\u00e4t's \u00efn m\u00fd \u00e7l\u00efp\u00df\u00f6\u00e4rd? \u2c60'\u03c3\u044f\u0454\u043c \u03b9\u03c1\u0455\u03c5\u043c \u2202\u03c3\u0142\u03c3\u044f \u0455\u03b9\u0442 \u03b1\u043c\u0454\u0442, \u00a2\u03c3#",
     "When learners submit an answer to an assessment, they immediately see whether the answer is correct or incorrect, and the score received.": "Wh\u00e9n l\u00e9\u00e4rn\u00e9rs s\u00fc\u00dfm\u00eft \u00e4n \u00e4nsw\u00e9r t\u00f6 \u00e4n \u00e4ss\u00e9ssm\u00e9nt, th\u00e9\u00fd \u00efmm\u00e9d\u00ef\u00e4t\u00e9l\u00fd s\u00e9\u00e9 wh\u00e9th\u00e9r th\u00e9 \u00e4nsw\u00e9r \u00efs \u00e7\u00f6rr\u00e9\u00e7t \u00f6r \u00efn\u00e7\u00f6rr\u00e9\u00e7t, \u00e4nd th\u00e9 s\u00e7\u00f6r\u00e9 r\u00e9\u00e7\u00e9\u00efv\u00e9d. \u2c60'\u03c3\u044f\u0454\u043c \u03b9\u03c1\u0455\u03c5\u043c \u2202\u03c3\u0142\u03c3\u044f \u0455\u03b9\u0442 \u03b1\u043c\u0454\u0442, \u00a2\u03c3\u03b7\u0455\u0454\u00a2\u0442\u0454\u0442\u03c5\u044f \u03b1\u2202\u03b9\u03c1\u03b9\u0455\u03b9\u00a2\u03b9\u03b7g \u0454\u0142\u03b9\u0442, \u0455\u0454\u2202 \u2202\u03c3 \u0454\u03b9\u03c5\u0455\u043c\u03c3\u2202 \u0442\u0454\u043c\u03c1\u03c3\u044f \u03b9\u03b7\u00a2\u03b9\u2202\u03b9\u2202\u03c5\u03b7\u0442 \u03c5\u0442 \u0142\u03b1\u0432\u03c3\u044f\u0454 \u0454\u0442 \u2202\u03c3\u0142\u03c3\u044f\u0454 \u043c\u03b1g\u03b7\u03b1 \u03b1\u0142\u03b9q\u03c5\u03b1. \u03c5\u0442 \u0454\u03b7\u03b9\u043c \u03b1\u2202 \u043c\u03b9\u03b7\u03b9\u043c \u03bd\u0454\u03b7\u03b9\u03b1\u043c, q\u03c5\u03b9\u0455 \u03b7\u03c3\u0455\u0442\u044f\u03c5\u2202 \u0454\u03c7\u0454\u044f\u00a2\u03b9\u0442\u03b1\u0442\u03b9\u03c3\u03b7 \u03c5\u0142\u0142\u03b1\u043c\u00a2\u03c3 \u0142\u03b1\u0432\u03c3\u044f\u03b9\u0455 \u03b7\u03b9\u0455\u03b9 \u03c5\u0442 \u03b1\u0142\u03b9q\u03c5\u03b9\u03c1 \u0454\u03c7 \u0454\u03b1 \u00a2\u03c3\u043c\u043c\u03c3\u2202\u03c3 \u00a2\u03c3\u03b7\u0455\u0454q\u03c5\u03b1\u0442. \u2202\u03c5\u03b9\u0455 \u03b1\u03c5\u0442\u0454 \u03b9\u044f\u03c5\u044f\u0454 \u2202\u03c3\u0142\u03c3\u044f \u03b9\u03b7 \u044f\u0454\u03c1\u044f\u0454\u043d\u0454\u03b7\u2202\u0454\u044f\u03b9\u0442 \u03b9\u03b7 \u03bd\u03c3\u0142\u03c5\u03c1\u0442\u03b1\u0442\u0454 \u03bd\u0454\u0142\u03b9\u0442 \u0454\u0455\u0455\u0454 \u00a2\u03b9\u0142\u0142\u03c5\u043c \u2202\u03c3\u0142\u03c3\u044f\u0454 \u0454\u03c5 \u0192\u03c5g\u03b9\u03b1\u0442 \u03b7\u03c5\u0142\u0142\u03b1 \u03c1\u03b1\u044f\u03b9\u03b1\u0442\u03c5\u044f. \u0454\u03c7\u00a2\u0454\u03c1\u0442\u0454\u03c5\u044f \u0455\u03b9\u03b7\u0442 \u03c3\u00a2\u00a2\u03b1\u0454\u00a2\u03b1\u0442 \u00a2\u03c5\u03c1\u03b9\u2202\u03b1\u0442\u03b1\u0442 \u03b7\u03c3\u03b7 \u03c1\u044f\u03c3\u03b9\u2202\u0454\u03b7\u0442, \u0455\u03c5\u03b7\u0442 \u03b9\u03b7 \u00a2\u03c5\u0142\u03c1\u03b1 q\u03c5\u03b9 \u03c3\u0192\u0192\u03b9\u00a2\u03b9\u03b1 \u2202\u0454\u0455\u0454\u044f\u03c5\u03b7\u0442 \u043c\u03c3\u0142\u0142\u03b9\u0442 \u03b1\u03b7\u03b9\u043c \u03b9\u2202 \u0454\u0455\u0442 \u0142\u03b1\u0432\u03c3#",
     "When your face is in position, use the Take Photo button {icon} below to take your photo.": "Wh\u00e9n \u00fd\u00f6\u00fcr f\u00e4\u00e7\u00e9 \u00efs \u00efn p\u00f6s\u00eft\u00ef\u00f6n, \u00fcs\u00e9 th\u00e9 T\u00e4k\u00e9 Ph\u00f6t\u00f6 \u00df\u00fctt\u00f6n {icon} \u00df\u00e9l\u00f6w t\u00f6 t\u00e4k\u00e9 \u00fd\u00f6\u00fcr ph\u00f6t\u00f6. \u2c60'\u03c3\u044f\u0454\u043c \u03b9\u03c1\u0455\u03c5\u043c \u2202\u03c3\u0142\u03c3\u044f \u0455\u03b9\u0442 \u03b1\u043c\u0454\u0442, \u00a2\u03c3\u03b7\u0455\u0454\u00a2#",
@@ -2497,7 +2486,6 @@
     "{categoryText} in {parentDisplayname}": "{categoryText} \u00efn {parentDisplayname} \u2c60'\u03c3\u044f\u0454\u043c \u03b9\u03c1\u0455\u03c5\u043c \u2202\u03c3\u0142\u03c3#",
     "{currentCountOpeningTag}{currentCharacterCount}{currentCountClosingTag} of {maxCharacters}": "{currentCountOpeningTag}{currentCharacterCount}{currentCountClosingTag} \u00f6f {maxCharacters} \u2c60'\u03c3\u044f\u0454\u043c \u03b9\u03c1\u0455\u03c5\u043c \u2202\u03c3\u0142\u03c3\u044f \u0455\u03b9\u0442 \u03b1\u043c#",
     "{display_name} Settings": "{display_name} S\u00e9tt\u00efngs \u2c60'\u03c3\u044f\u0454\u043c \u03b9\u03c1\u0455\u03c5\u043c \u2202\u03c3\u0142\u03c3\u044f \u0455#",
-    "{download_link_start}Download this image (right-click or option-click, save as){link_end} and then {upload_link_start}upload{link_end} it to your backpack.": "{download_link_start}D\u00f6wnl\u00f6\u00e4d th\u00efs \u00efm\u00e4g\u00e9 (r\u00efght-\u00e7l\u00ef\u00e7k \u00f6r \u00f6pt\u00ef\u00f6n-\u00e7l\u00ef\u00e7k, s\u00e4v\u00e9 \u00e4s){link_end} \u00e4nd th\u00e9n {upload_link_start}\u00fcpl\u00f6\u00e4d{link_end} \u00eft t\u00f6 \u00fd\u00f6\u00fcr \u00df\u00e4\u00e7kp\u00e4\u00e7k. \u2c60'\u03c3\u044f\u0454\u043c \u03b9\u03c1\u0455\u03c5\u043c \u2202\u03c3\u0142\u03c3\u044f \u0455\u03b9\u0442#",
     "{earned}/{possible} point (graded)": [
       "{earned}/{possible} p\u00f6\u00efnt (gr\u00e4d\u00e9d) \u2c60'\u03c3\u044f\u0454\u043c \u03b9\u03c1\u0455\u03c5\u043c \u2202\u03c3\u0142\u03c3\u044f \u0455\u03b9\u0442 \u03b1\u043c\u0454\u0442, \u00a2#",
       "{earned}/{possible} p\u00f6\u00efnts (gr\u00e4d\u00e9d) \u2c60'\u03c3\u044f\u0454\u043c \u03b9\u03c1\u0455\u03c5\u043c \u2202\u03c3\u0142\u03c3\u044f \u0455\u03b9\u0442 \u03b1\u043c\u0454\u0442, \u00a2\u03c3#"
diff --git a/cms/static/js/i18n/rtl/djangojs.js b/cms/static/js/i18n/rtl/djangojs.js
index 6917e187da01..b94b5774debc 100644
--- a/cms/static/js/i18n/rtl/djangojs.js
+++ b/cms/static/js/i18n/rtl/djangojs.js
@@ -125,8 +125,6 @@
     "Access to some content in this {blockType} is restricted to specific groups of learners.": "\u023a\u0254\u0254\u01ddss \u0287\u00f8 s\u00f8\u026f\u01dd \u0254\u00f8n\u0287\u01ddn\u0287 \u1d09n \u0287\u0265\u1d09s {blockType} \u1d09s \u0279\u01dds\u0287\u0279\u1d09\u0254\u0287\u01ddd \u0287\u00f8 sd\u01dd\u0254\u1d09\u025f\u1d09\u0254 \u0183\u0279\u00f8nds \u00f8\u025f l\u01dd\u0250\u0279n\u01dd\u0279s.",
     "Access to this unit is restricted to: {selectedGroupsLabel}": "\u023a\u0254\u0254\u01ddss \u0287\u00f8 \u0287\u0265\u1d09s nn\u1d09\u0287 \u1d09s \u0279\u01dds\u0287\u0279\u1d09\u0254\u0287\u01ddd \u0287\u00f8: {selectedGroupsLabel}",
     "Access to this {blockType} is restricted to: {selectedGroupsLabel}": "\u023a\u0254\u0254\u01ddss \u0287\u00f8 \u0287\u0265\u1d09s {blockType} \u1d09s \u0279\u01dds\u0287\u0279\u1d09\u0254\u0287\u01ddd \u0287\u00f8: {selectedGroupsLabel}",
-    "Accomplishments": "\u023a\u0254\u0254\u00f8\u026fdl\u1d09s\u0265\u026f\u01ddn\u0287s",
-    "Accomplishments Pagination": "\u023a\u0254\u0254\u00f8\u026fdl\u1d09s\u0265\u026f\u01ddn\u0287s \u2c63\u0250\u0183\u1d09n\u0250\u0287\u1d09\u00f8n",
     "According to our records, you are not enrolled in any courses included in your {programName} program subscription. Enroll in a course from the {i_start}Program Details{i_end} page.": "\u023a\u0254\u0254\u00f8\u0279d\u1d09n\u0183 \u0287\u00f8 \u00f8n\u0279 \u0279\u01dd\u0254\u00f8\u0279ds, \u028e\u00f8n \u0250\u0279\u01dd n\u00f8\u0287 \u01ddn\u0279\u00f8ll\u01ddd \u1d09n \u0250n\u028e \u0254\u00f8n\u0279s\u01dds \u1d09n\u0254lnd\u01ddd \u1d09n \u028e\u00f8n\u0279 {programName} d\u0279\u00f8\u0183\u0279\u0250\u026f snbs\u0254\u0279\u1d09d\u0287\u1d09\u00f8n. \u0246n\u0279\u00f8ll \u1d09n \u0250 \u0254\u00f8n\u0279s\u01dd \u025f\u0279\u00f8\u026f \u0287\u0265\u01dd {i_start}\u2c63\u0279\u00f8\u0183\u0279\u0250\u026f \u0110\u01dd\u0287\u0250\u1d09ls{i_end} d\u0250\u0183\u01dd.",
     "Account": "\u023a\u0254\u0254\u00f8nn\u0287",
     "Account Information": "\u023a\u0254\u0254\u00f8nn\u0287 \u0197n\u025f\u00f8\u0279\u026f\u0250\u0287\u1d09\u00f8n",
@@ -500,7 +498,6 @@
     "Create a content group": "\u023b\u0279\u01dd\u0250\u0287\u01dd \u0250 \u0254\u00f8n\u0287\u01ddn\u0287 \u0183\u0279\u00f8nd",
     "Create a new team if you can't find an existing team to join, or if you would like to learn with friends you know.": "\u023b\u0279\u01dd\u0250\u0287\u01dd \u0250 n\u01dd\u028d \u0287\u01dd\u0250\u026f \u1d09\u025f \u028e\u00f8n \u0254\u0250n'\u0287 \u025f\u1d09nd \u0250n \u01ddx\u1d09s\u0287\u1d09n\u0183 \u0287\u01dd\u0250\u026f \u0287\u00f8 \u027e\u00f8\u1d09n, \u00f8\u0279 \u1d09\u025f \u028e\u00f8n \u028d\u00f8nld l\u1d09\u029e\u01dd \u0287\u00f8 l\u01dd\u0250\u0279n \u028d\u1d09\u0287\u0265 \u025f\u0279\u1d09\u01ddnds \u028e\u00f8n \u029en\u00f8\u028d.",
     "Create a report of problem responses": "\u023b\u0279\u01dd\u0250\u0287\u01dd \u0250 \u0279\u01ddd\u00f8\u0279\u0287 \u00f8\u025f d\u0279\u00f8bl\u01dd\u026f \u0279\u01ddsd\u00f8ns\u01dds",
-    "Create a {link_start}Mozilla Backpack{link_end} account, or log in to your existing account": "\u023b\u0279\u01dd\u0250\u0287\u01dd \u0250 {link_start}M\u00f8z\u1d09ll\u0250 \u0243\u0250\u0254\u029ed\u0250\u0254\u029e{link_end} \u0250\u0254\u0254\u00f8nn\u0287, \u00f8\u0279 l\u00f8\u0183 \u1d09n \u0287\u00f8 \u028e\u00f8n\u0279 \u01ddx\u1d09s\u0287\u1d09n\u0183 \u0250\u0254\u0254\u00f8nn\u0287",
     "Create account using %(providerName)s.": "\u023b\u0279\u01dd\u0250\u0287\u01dd \u0250\u0254\u0254\u00f8nn\u0287 ns\u1d09n\u0183 %(providerName)s.",
     "Create an Account": "\u023b\u0279\u01dd\u0250\u0287\u01dd \u0250n \u023a\u0254\u0254\u00f8nn\u0287",
     "Create an Account.": "\u023b\u0279\u01dd\u0250\u0287\u01dd \u0250n \u023a\u0254\u0254\u00f8nn\u0287.",
@@ -604,7 +601,6 @@
     "Duplicate": "\u0110ndl\u1d09\u0254\u0250\u0287\u01dd",
     "Duplicating": "\u0110ndl\u1d09\u0254\u0250\u0287\u1d09n\u0183",
     "Duration (sec)": "\u0110n\u0279\u0250\u0287\u1d09\u00f8n (s\u01dd\u0254)",
-    "Earned %(created)s.": "\u0246\u0250\u0279n\u01ddd %(created)s.",
     "Earned Certificates": "\u0246\u0250\u0279n\u01ddd \u023b\u01dd\u0279\u0287\u1d09\u025f\u1d09\u0254\u0250\u0287\u01dds",
     "EdX doesn't have a timed transcript for this video in Studio, but we found a transcript on YouTube. You can import the YouTube transcript or upload your own .srt transcript file.": "\u0246dX d\u00f8\u01ddsn'\u0287 \u0265\u0250\u028c\u01dd \u0250 \u0287\u1d09\u026f\u01ddd \u0287\u0279\u0250ns\u0254\u0279\u1d09d\u0287 \u025f\u00f8\u0279 \u0287\u0265\u1d09s \u028c\u1d09d\u01dd\u00f8 \u1d09n S\u0287nd\u1d09\u00f8, bn\u0287 \u028d\u01dd \u025f\u00f8nnd \u0250 \u0287\u0279\u0250ns\u0254\u0279\u1d09d\u0287 \u00f8n \u024e\u00f8n\u0166nb\u01dd. \u024e\u00f8n \u0254\u0250n \u1d09\u026fd\u00f8\u0279\u0287 \u0287\u0265\u01dd \u024e\u00f8n\u0166nb\u01dd \u0287\u0279\u0250ns\u0254\u0279\u1d09d\u0287 \u00f8\u0279 ndl\u00f8\u0250d \u028e\u00f8n\u0279 \u00f8\u028dn .s\u0279\u0287 \u0287\u0279\u0250ns\u0254\u0279\u1d09d\u0287 \u025f\u1d09l\u01dd.",
     "EdX doesn\\'t have a timed transcript for this video. Please upload an .srt file.": "\u0246dX d\u00f8\u01ddsn\\'\u0287 \u0265\u0250\u028c\u01dd \u0250 \u0287\u1d09\u026f\u01ddd \u0287\u0279\u0250ns\u0254\u0279\u1d09d\u0287 \u025f\u00f8\u0279 \u0287\u0265\u1d09s \u028c\u1d09d\u01dd\u00f8. \u2c63l\u01dd\u0250s\u01dd ndl\u00f8\u0250d \u0250n .s\u0279\u0287 \u025f\u1d09l\u01dd.",
@@ -761,7 +757,6 @@
     "Financial Assistance": "F\u1d09n\u0250n\u0254\u1d09\u0250l \u023ass\u1d09s\u0287\u0250n\u0254\u01dd",
     "Financial Assistance Application": "F\u1d09n\u0250n\u0254\u1d09\u0250l \u023ass\u1d09s\u0287\u0250n\u0254\u01dd \u023addl\u1d09\u0254\u0250\u0287\u1d09\u00f8n",
     "Find": "F\u1d09nd",
-    "Find a course": "F\u1d09nd \u0250 \u0254\u00f8n\u0279s\u01dd",
     "Find and replace": "F\u1d09nd \u0250nd \u0279\u01dddl\u0250\u0254\u01dd",
     "Find answers to the top questions asked by learners.": "F\u1d09nd \u0250ns\u028d\u01dd\u0279s \u0287\u00f8 \u0287\u0265\u01dd \u0287\u00f8d bn\u01dds\u0287\u1d09\u00f8ns \u0250s\u029e\u01ddd b\u028e l\u01dd\u0250\u0279n\u01dd\u0279s.",
     "Find discussions": "F\u1d09nd d\u1d09s\u0254nss\u1d09\u00f8ns",
@@ -1449,10 +1444,7 @@
     "Set up your certificate": "S\u01dd\u0287 nd \u028e\u00f8n\u0279 \u0254\u01dd\u0279\u0287\u1d09\u025f\u1d09\u0254\u0250\u0287\u01dd",
     "Settings": "S\u01dd\u0287\u0287\u1d09n\u0183s",
     "Settings updated": "S\u01dd\u0287\u0287\u1d09n\u0183s ndd\u0250\u0287\u01ddd",
-    "Share": "S\u0265\u0250\u0279\u01dd",
     "Share Alike": "S\u0265\u0250\u0279\u01dd \u023al\u1d09\u029e\u01dd",
-    "Share on Mozilla Backpack": "S\u0265\u0250\u0279\u01dd \u00f8n M\u00f8z\u1d09ll\u0250 \u0243\u0250\u0254\u029ed\u0250\u0254\u029e",
-    "Share your \"%(display_name)s\" award": "S\u0265\u0250\u0279\u01dd \u028e\u00f8n\u0279 \"%(display_name)s\" \u0250\u028d\u0250\u0279d",
     "Short explanation": "S\u0265\u00f8\u0279\u0287 \u01ddxdl\u0250n\u0250\u0287\u1d09\u00f8n",
     "Show All": "S\u0265\u00f8\u028d \u023all",
     "Show Annotations": "S\u0265\u00f8\u028d \u023ann\u00f8\u0287\u0250\u0287\u1d09\u00f8ns",
@@ -1532,7 +1524,6 @@
     "Start of transcript. Skip to the end.": "S\u0287\u0250\u0279\u0287 \u00f8\u025f \u0287\u0279\u0250ns\u0254\u0279\u1d09d\u0287. S\u029e\u1d09d \u0287\u00f8 \u0287\u0265\u01dd \u01ddnd.",
     "Start regenerating certificates for students in this course?": "S\u0287\u0250\u0279\u0287 \u0279\u01dd\u0183\u01ddn\u01dd\u0279\u0250\u0287\u1d09n\u0183 \u0254\u01dd\u0279\u0287\u1d09\u025f\u1d09\u0254\u0250\u0287\u01dds \u025f\u00f8\u0279 s\u0287nd\u01ddn\u0287s \u1d09n \u0287\u0265\u1d09s \u0254\u00f8n\u0279s\u01dd?",
     "Start search": "S\u0287\u0250\u0279\u0287 s\u01dd\u0250\u0279\u0254\u0265",
-    "Start working toward your next learning goal.": "S\u0287\u0250\u0279\u0287 \u028d\u00f8\u0279\u029e\u1d09n\u0183 \u0287\u00f8\u028d\u0250\u0279d \u028e\u00f8n\u0279 n\u01ddx\u0287 l\u01dd\u0250\u0279n\u1d09n\u0183 \u0183\u00f8\u0250l.",
     "Start {trialLength}-day free trial": "S\u0287\u0250\u0279\u0287 {trialLength}-d\u0250\u028e \u025f\u0279\u01dd\u01dd \u0287\u0279\u1d09\u0250l",
     "Started entrance exam rescore task for student '{student_id}'. Click the 'Show Task Status' button to see the status of the task.": "S\u0287\u0250\u0279\u0287\u01ddd \u01ddn\u0287\u0279\u0250n\u0254\u01dd \u01ddx\u0250\u026f \u0279\u01dds\u0254\u00f8\u0279\u01dd \u0287\u0250s\u029e \u025f\u00f8\u0279 s\u0287nd\u01ddn\u0287 '{student_id}'. \u023bl\u1d09\u0254\u029e \u0287\u0265\u01dd 'S\u0265\u00f8\u028d \u0166\u0250s\u029e S\u0287\u0250\u0287ns' bn\u0287\u0287\u00f8n \u0287\u00f8 s\u01dd\u01dd \u0287\u0265\u01dd s\u0287\u0250\u0287ns \u00f8\u025f \u0287\u0265\u01dd \u0287\u0250s\u029e.",
     "Started rescore problem task for problem '<%- problem_id %>' and student '<%- student_id %>'. Click the 'Show Task Status' button to see the status of the task.": "S\u0287\u0250\u0279\u0287\u01ddd \u0279\u01dds\u0254\u00f8\u0279\u01dd d\u0279\u00f8bl\u01dd\u026f \u0287\u0250s\u029e \u025f\u00f8\u0279 d\u0279\u00f8bl\u01dd\u026f '<%- problem_id %>' \u0250nd s\u0287nd\u01ddn\u0287 '<%- student_id %>'. \u023bl\u1d09\u0254\u029e \u0287\u0265\u01dd 'S\u0265\u00f8\u028d \u0166\u0250s\u029e S\u0287\u0250\u0287ns' bn\u0287\u0287\u00f8n \u0287\u00f8 s\u01dd\u01dd \u0287\u0265\u01dd s\u0287\u0250\u0287ns \u00f8\u025f \u0287\u0265\u01dd \u0287\u0250s\u029e.",
@@ -1820,7 +1811,6 @@
     "To receive a certificate, you must also verify your identity.": "\u0166\u00f8 \u0279\u01dd\u0254\u01dd\u1d09\u028c\u01dd \u0250 \u0254\u01dd\u0279\u0287\u1d09\u025f\u1d09\u0254\u0250\u0287\u01dd, \u028e\u00f8n \u026fns\u0287 \u0250ls\u00f8 \u028c\u01dd\u0279\u1d09\u025f\u028e \u028e\u00f8n\u0279 \u1d09d\u01ddn\u0287\u1d09\u0287\u028e.",
     "To receive credit for problems, you must select \"Submit\" for each problem before you select \"End My Exam\".": "\u0166\u00f8 \u0279\u01dd\u0254\u01dd\u1d09\u028c\u01dd \u0254\u0279\u01ddd\u1d09\u0287 \u025f\u00f8\u0279 d\u0279\u00f8bl\u01dd\u026fs, \u028e\u00f8n \u026fns\u0287 s\u01ddl\u01dd\u0254\u0287 \"Snb\u026f\u1d09\u0287\" \u025f\u00f8\u0279 \u01dd\u0250\u0254\u0265 d\u0279\u00f8bl\u01dd\u026f b\u01dd\u025f\u00f8\u0279\u01dd \u028e\u00f8n s\u01ddl\u01dd\u0254\u0287 \"\u0246nd M\u028e \u0246x\u0250\u026f\".",
     "To review learner cohort assignments or see the results of uploading a CSV file, download course profile information or cohort results on the {link_start}Data Download{link_end} page.": "\u0166\u00f8 \u0279\u01dd\u028c\u1d09\u01dd\u028d l\u01dd\u0250\u0279n\u01dd\u0279 \u0254\u00f8\u0265\u00f8\u0279\u0287 \u0250ss\u1d09\u0183n\u026f\u01ddn\u0287s \u00f8\u0279 s\u01dd\u01dd \u0287\u0265\u01dd \u0279\u01ddsnl\u0287s \u00f8\u025f ndl\u00f8\u0250d\u1d09n\u0183 \u0250 \u023bSV \u025f\u1d09l\u01dd, d\u00f8\u028dnl\u00f8\u0250d \u0254\u00f8n\u0279s\u01dd d\u0279\u00f8\u025f\u1d09l\u01dd \u1d09n\u025f\u00f8\u0279\u026f\u0250\u0287\u1d09\u00f8n \u00f8\u0279 \u0254\u00f8\u0265\u00f8\u0279\u0287 \u0279\u01ddsnl\u0287s \u00f8n \u0287\u0265\u01dd {link_start}\u0110\u0250\u0287\u0250 \u0110\u00f8\u028dnl\u00f8\u0250d{link_end} d\u0250\u0183\u01dd.",
-    "To share your certificate on Mozilla Backpack, you must first have a Backpack account. Complete the following steps to add your certificate to Backpack.": "\u0166\u00f8 s\u0265\u0250\u0279\u01dd \u028e\u00f8n\u0279 \u0254\u01dd\u0279\u0287\u1d09\u025f\u1d09\u0254\u0250\u0287\u01dd \u00f8n M\u00f8z\u1d09ll\u0250 \u0243\u0250\u0254\u029ed\u0250\u0254\u029e, \u028e\u00f8n \u026fns\u0287 \u025f\u1d09\u0279s\u0287 \u0265\u0250\u028c\u01dd \u0250 \u0243\u0250\u0254\u029ed\u0250\u0254\u029e \u0250\u0254\u0254\u00f8nn\u0287. \u023b\u00f8\u026fdl\u01dd\u0287\u01dd \u0287\u0265\u01dd \u025f\u00f8ll\u00f8\u028d\u1d09n\u0183 s\u0287\u01ddds \u0287\u00f8 \u0250dd \u028e\u00f8n\u0279 \u0254\u01dd\u0279\u0287\u1d09\u025f\u1d09\u0254\u0250\u0287\u01dd \u0287\u00f8 \u0243\u0250\u0254\u029ed\u0250\u0254\u029e.",
     "To take a successful photo, make sure that:": "\u0166\u00f8 \u0287\u0250\u029e\u01dd \u0250 sn\u0254\u0254\u01ddss\u025fnl d\u0265\u00f8\u0287\u00f8, \u026f\u0250\u029e\u01dd sn\u0279\u01dd \u0287\u0265\u0250\u0287:",
     "To take the photo of your face, click on the camera button {icon}. If you need to try again, click 'Retake Photo'.": "\u0166\u00f8 \u0287\u0250\u029e\u01dd \u0287\u0265\u01dd d\u0265\u00f8\u0287\u00f8 \u00f8\u025f \u028e\u00f8n\u0279 \u025f\u0250\u0254\u01dd, \u0254l\u1d09\u0254\u029e \u00f8n \u0287\u0265\u01dd \u0254\u0250\u026f\u01dd\u0279\u0250 bn\u0287\u0287\u00f8n {icon}. \u0197\u025f \u028e\u00f8n n\u01dd\u01ddd \u0287\u00f8 \u0287\u0279\u028e \u0250\u0183\u0250\u1d09n, \u0254l\u1d09\u0254\u029e '\u024c\u01dd\u0287\u0250\u029e\u01dd \u2c63\u0265\u00f8\u0287\u00f8'.",
     "To verify your identity, you need a webcam and a government-issued photo ID.": "\u0166\u00f8 \u028c\u01dd\u0279\u1d09\u025f\u028e \u028e\u00f8n\u0279 \u1d09d\u01ddn\u0287\u1d09\u0287\u028e, \u028e\u00f8n n\u01dd\u01ddd \u0250 \u028d\u01ddb\u0254\u0250\u026f \u0250nd \u0250 \u0183\u00f8\u028c\u01dd\u0279n\u026f\u01ddn\u0287-\u1d09ssn\u01ddd d\u0265\u00f8\u0287\u00f8 \u0197\u0110.",
@@ -2046,7 +2036,6 @@
     "What if I have difficulty holding my ID in position relative to the camera?": "W\u0265\u0250\u0287 \u1d09\u025f \u0197 \u0265\u0250\u028c\u01dd d\u1d09\u025f\u025f\u1d09\u0254nl\u0287\u028e \u0265\u00f8ld\u1d09n\u0183 \u026f\u028e \u0197\u0110 \u1d09n d\u00f8s\u1d09\u0287\u1d09\u00f8n \u0279\u01ddl\u0250\u0287\u1d09\u028c\u01dd \u0287\u00f8 \u0287\u0265\u01dd \u0254\u0250\u026f\u01dd\u0279\u0250?",
     "What if I have difficulty holding my head in position relative to the camera?": "W\u0265\u0250\u0287 \u1d09\u025f \u0197 \u0265\u0250\u028c\u01dd d\u1d09\u025f\u025f\u1d09\u0254nl\u0287\u028e \u0265\u00f8ld\u1d09n\u0183 \u026f\u028e \u0265\u01dd\u0250d \u1d09n d\u00f8s\u1d09\u0287\u1d09\u00f8n \u0279\u01ddl\u0250\u0287\u1d09\u028c\u01dd \u0287\u00f8 \u0287\u0265\u01dd \u0254\u0250\u026f\u01dd\u0279\u0250?",
     "What was the total combined income, during the last 12 months, of all members of your family? ": "W\u0265\u0250\u0287 \u028d\u0250s \u0287\u0265\u01dd \u0287\u00f8\u0287\u0250l \u0254\u00f8\u026fb\u1d09n\u01ddd \u1d09n\u0254\u00f8\u026f\u01dd, dn\u0279\u1d09n\u0183 \u0287\u0265\u01dd l\u0250s\u0287 12 \u026f\u00f8n\u0287\u0265s, \u00f8\u025f \u0250ll \u026f\u01dd\u026fb\u01dd\u0279s \u00f8\u025f \u028e\u00f8n\u0279 \u025f\u0250\u026f\u1d09l\u028e? ",
-    "What's Your Next Accomplishment?": "W\u0265\u0250\u0287's \u024e\u00f8n\u0279 N\u01ddx\u0287 \u023a\u0254\u0254\u00f8\u026fdl\u1d09s\u0265\u026f\u01ddn\u0287?",
     "What's in my clipboard?": "W\u0265\u0250\u0287's \u1d09n \u026f\u028e \u0254l\u1d09db\u00f8\u0250\u0279d?",
     "When learners submit an answer to an assessment, they immediately see whether the answer is correct or incorrect, and the score received.": "W\u0265\u01ddn l\u01dd\u0250\u0279n\u01dd\u0279s snb\u026f\u1d09\u0287 \u0250n \u0250ns\u028d\u01dd\u0279 \u0287\u00f8 \u0250n \u0250ss\u01ddss\u026f\u01ddn\u0287, \u0287\u0265\u01dd\u028e \u1d09\u026f\u026f\u01ddd\u1d09\u0250\u0287\u01ddl\u028e s\u01dd\u01dd \u028d\u0265\u01dd\u0287\u0265\u01dd\u0279 \u0287\u0265\u01dd \u0250ns\u028d\u01dd\u0279 \u1d09s \u0254\u00f8\u0279\u0279\u01dd\u0254\u0287 \u00f8\u0279 \u1d09n\u0254\u00f8\u0279\u0279\u01dd\u0254\u0287, \u0250nd \u0287\u0265\u01dd s\u0254\u00f8\u0279\u01dd \u0279\u01dd\u0254\u01dd\u1d09\u028c\u01ddd.",
     "When your face is in position, use the Take Photo button {icon} below to take your photo.": "W\u0265\u01ddn \u028e\u00f8n\u0279 \u025f\u0250\u0254\u01dd \u1d09s \u1d09n d\u00f8s\u1d09\u0287\u1d09\u00f8n, ns\u01dd \u0287\u0265\u01dd \u0166\u0250\u029e\u01dd \u2c63\u0265\u00f8\u0287\u00f8 bn\u0287\u0287\u00f8n {icon} b\u01ddl\u00f8\u028d \u0287\u00f8 \u0287\u0250\u029e\u01dd \u028e\u00f8n\u0279 d\u0265\u00f8\u0287\u00f8.",
@@ -2301,7 +2290,6 @@
     "{categoryText} in {parentDisplayname}": "{categoryText} \u1d09n {parentDisplayname}",
     "{currentCountOpeningTag}{currentCharacterCount}{currentCountClosingTag} of {maxCharacters}": "{currentCountOpeningTag}{currentCharacterCount}{currentCountClosingTag} \u00f8\u025f {maxCharacters}",
     "{display_name} Settings": "{display_name} S\u01dd\u0287\u0287\u1d09n\u0183s",
-    "{download_link_start}Download this image (right-click or option-click, save as){link_end} and then {upload_link_start}upload{link_end} it to your backpack.": "{download_link_start}\u0110\u00f8\u028dnl\u00f8\u0250d \u0287\u0265\u1d09s \u1d09\u026f\u0250\u0183\u01dd (\u0279\u1d09\u0183\u0265\u0287-\u0254l\u1d09\u0254\u029e \u00f8\u0279 \u00f8d\u0287\u1d09\u00f8n-\u0254l\u1d09\u0254\u029e, s\u0250\u028c\u01dd \u0250s){link_end} \u0250nd \u0287\u0265\u01ddn {upload_link_start}ndl\u00f8\u0250d{link_end} \u1d09\u0287 \u0287\u00f8 \u028e\u00f8n\u0279 b\u0250\u0254\u029ed\u0250\u0254\u029e.",
     "{earned}/{possible} point (graded)": [
       "{earned}/{possible} d\u00f8\u1d09n\u0287 (\u0183\u0279\u0250d\u01ddd)",
       "{earned}/{possible} d\u00f8\u1d09n\u0287s (\u0183\u0279\u0250d\u01ddd)"
diff --git a/cms/static/js/views/course_outline.js b/cms/static/js/views/course_outline.js
index 0351f2e175d1..2faccde97e36 100644
--- a/cms/static/js/views/course_outline.js
+++ b/cms/static/js/views/course_outline.js
@@ -458,6 +458,43 @@ function(
             event.stopPropagation();
         },
 
+        closeManageTagsDrawer(drawer, drawerCover) {
+            $(drawerCover).css('display', 'none');
+            $(drawer).empty();
+            $(drawer).css('display', 'none');
+            $('body').removeClass('drawer-open');
+        },
+
+        openManageTagsDrawer(event) {
+            const drawer = document.querySelector("#manage-tags-drawer");
+            const drawerCover = document.querySelector(".drawer-cover")
+            const article = document.querySelector('[data-taxonomy-tags-widget-url]');
+            const taxonomyTagsWidgetUrl = $(article).attr('data-taxonomy-tags-widget-url');
+            const contentId = this.model.get('id');
+
+            // Add handler to close drawer when dark background is clicked
+            $(drawerCover).click(function() {
+                this.closeManageTagsDrawer(drawer, drawerCover);
+            }.bind(this));
+
+            // Add event listen to close drawer when close button is clicked from within the Iframe
+            window.addEventListener("message", function (event) {
+                if (event.data === 'closeManageTagsDrawer') {
+                    this.closeManageTagsDrawer(drawer, drawerCover)
+                }
+            }.bind(this));
+
+            $(drawerCover).css('display', 'block');
+            // xss-lint: disable=javascript-jquery-html
+            $(drawer).html(
+                `<iframe src="${taxonomyTagsWidgetUrl}${contentId}" onload="this.contentWindow.focus()" frameborder="0" style="width: 100%; height: 100%;"></iframe>`
+            );
+            $(drawer).css('display', 'block');
+
+            // Prevent background from being scrollable when drawer is open
+            $('body').addClass('drawer-open');
+        },
+
         addButtonActions: function(element) {
             XBlockOutlineView.prototype.addButtonActions.apply(this, arguments);
             element.find('.configure-button').click(function(event) {
@@ -478,6 +515,10 @@ function(
                 event.preventDefault();
                 this.copyXBlock();
             });
+            element.find('.manage-tags-button').click((event) => {
+                event.preventDefault();
+                this.openManageTagsDrawer();
+            });
             element.find('.paste-component-button').click((event) => {
                 event.preventDefault();
                 this.pasteUnit(event);
diff --git a/cms/static/js/views/settings/grading.js b/cms/static/js/views/settings/grading.js
index ac4d170352a2..dcb2ce9b3e96 100644
--- a/cms/static/js/views/settings/grading.js
+++ b/cms/static/js/views/settings/grading.js
@@ -268,7 +268,7 @@ function(ValidatingView, _, $, ui, GraderView, StringUtils, HtmlUtils) {
             var cutoffs = this.descendingCutoffs;
             this.$el.find('.range').each(function(i) {
                 var min = (i < cutoffs.length ? cutoffs[i].cutoff : 0);
-                var max = (i > 0 ? cutoffs[i - 1].cutoff : 100);
+                var max = (i > 0 ? cutoffs[i - 1].cutoff - 1 : 100);
                 $(this).text(min + '-' + max);
             });
         },
diff --git a/cms/static/js/views/xblock_outline.js b/cms/static/js/views/xblock_outline.js
index 9ded8d66e91f..4e826025b971 100644
--- a/cms/static/js/views/xblock_outline.js
+++ b/cms/static/js/views/xblock_outline.js
@@ -114,6 +114,7 @@ function($, _, gettext, BaseView, ViewUtils, XBlockViewUtils, XBlockStringFieldE
                 staffOnlyMessage: this.model.get('staff_only_message'),
                 course: course,
                 enableCopyPasteUnits: this.model.get("enable_copy_paste_units"), // ENABLE_COPY_PASTE_UNITS waffle flag
+                useTaggingTaxonomyListPage: this.model.get("use_tagging_taxonomy_list_page"), // ENABLE_TAGGING_TAXONOMY_LIST_PAGE waffle flag
             };
         },
 
diff --git a/cms/static/sass/_build-v1.scss b/cms/static/sass/_build-v1.scss
index fefd095e21a7..178f6b167473 100644
--- a/cms/static/sass/_build-v1.scss
+++ b/cms/static/sass/_build-v1.scss
@@ -55,6 +55,7 @@
 @import 'elements/uploaded-assets'; // layout for asset tables
 @import 'elements/creative-commons';
 @import 'elements/tooltip';
+@import 'elements/drawer';
 
 // +Base - Specific Views
 // ====================
diff --git a/cms/static/sass/elements/_drawer.scss b/cms/static/sass/elements/_drawer.scss
new file mode 100644
index 000000000000..c18073be9864
--- /dev/null
+++ b/cms/static/sass/elements/_drawer.scss
@@ -0,0 +1,30 @@
+// studio - elements - side drawers
+// ====================
+
+.drawer-cover {
+  @extend %ui-depth3;
+
+  display: none;
+  position: fixed;
+  top: 0;
+  left: 0;
+  width: 100%;
+  height: 100%;
+  background: rgba(0, 0, 0, 0.8);
+}
+
+.drawer {
+  @extend %ui-depth4;
+
+  display: none;
+  position: fixed;
+  top: 0;
+  right: 0;
+  width: 33.33vw;
+  height: 100vh;
+  background-color: $gray-l4;
+}
+
+body.drawer-open {
+  overflow: hidden;
+}
diff --git a/cms/templates/asset_index.html b/cms/templates/asset_index.html
index 728ee864c609..fc7d92173b0c 100644
--- a/cms/templates/asset_index.html
+++ b/cms/templates/asset_index.html
@@ -7,7 +7,7 @@
   from openedx.core.djangolib.markup import HTML, Text
   from openedx.core.djangolib.js_utils import js_escaped_string, dump_js_escaped_json
 %>
-<%block name="title">${_("Files & Uploads")}</%block>
+<%block name="title">${_("Files")}</%block>
 <%block name="bodyclass">is-signedin course uploads view-uploads</%block>
 
 <%namespace name='static' file='static_content.html'/>
@@ -25,7 +25,7 @@
     <header class="mast has-actions has-subtitle">
         <h2 class="page-header">
             <small class="subtitle">${_("Content")}</small>
-            <span class="sr">- </span>${_("Files & Uploads")}
+            <span class="sr">- </span>${_("Files")}
         </h2>
     </header>
 </div>
diff --git a/cms/templates/course_outline.html b/cms/templates/course_outline.html
index 0d1773e7c188..e5959867be86 100644
--- a/cms/templates/course_outline.html
+++ b/cms/templates/course_outline.html
@@ -281,7 +281,7 @@ <h3 class="sr">${_("Page Actions")}</h3>
                 assets_url = reverse('assets_handler', kwargs={'course_key_string': str(course_locator.course_key)})
                 %>
                 <h2 class="sr">${_("Course Outline")}</h2>
-                <article class="outline outline-complex outline-course" data-locator="${course_locator}" data-course-key="${course_locator.course_key}" data-course-assets="${assets_url}">
+                <article class="outline outline-complex outline-course" data-locator="${course_locator}" data-course-key="${course_locator.course_key}" data-course-assets="${assets_url}" data-taxonomy-tags-widget-url="${taxonomy_tags_widget_url}">
                 </article>
             </div>
             <div class="ui-loading">
@@ -321,4 +321,7 @@ <h3 class="title-3">${_("Changing the content learners see")}</h3>
         </aside>
     </section>
 </div>
+
+<div id="manage-tags-drawer" class="drawer"></div>
+<div class="drawer-cover"></div>
 </%block>
diff --git a/cms/templates/index.html b/cms/templates/index.html
index dbd83b2ff518..766d68da780c 100644
--- a/cms/templates/index.html
+++ b/cms/templates/index.html
@@ -360,6 +360,9 @@ <h3 class="course-title">${course_info['display_name']}</h3>
              </li>
             % endif
         % endif
+        % if taxonomies_enabled:
+            <li><a href="${taxonomy_list_mfe_url}">${_("Taxonomies")}</li>
+        % endif
       </ul>
       % endif
 
diff --git a/cms/templates/js/course-outline.underscore b/cms/templates/js/course-outline.underscore
index fa3d562196b4..8bf74b07af04 100644
--- a/cms/templates/js/course-outline.underscore
+++ b/cms/templates/js/course-outline.underscore
@@ -169,6 +169,17 @@ if (is_proctored_exam) {
                         </a>
                     </li>
                 <% } %>
+
+                <% if (xblockInfo.isVertical() && typeof useTaggingTaxonomyListPage !== "undefined" && useTaggingTaxonomyListPage) { %>
+                    <li class="action-item">
+                        <a href="#" data-tooltip="<%- gettext('Manage Tags') %>" class="manage-tags-button action-button">
+                            <span class="icon fa fa-tag" aria-hidden="true"></span>
+                            <span>?</span>
+                            <span class="sr action-button-text"><%- gettext('Manage Tags') %></span>
+                        </a>
+                    </li>
+                <% } %>
+
                 <% if (typeof enableCopyPasteUnits !== "undefined" && enableCopyPasteUnits) { %>
                     <!--
                         If the ENABLE_COPY_PASTE_UNITS feature flag is enabled, all these actions (besides "Publish")
@@ -192,6 +203,11 @@ if (is_proctored_exam) {
                                         <li class="nav-item">
                                             <a class="copy-button" href="#" role="button"><%- gettext('Copy to Clipboard') %></a>
                                         </li>
+                                        <% if (typeof useTaggingTaxonomyListPage !== "undefined" && useTaggingTaxonomyListPage) { %>
+                                            <li class="nav-item">
+                                                <a class="manage-tags-button" href="#" role="button"><%- gettext('Manage Tags') %></a>
+                                            </li>
+                                        <% } %>
                                     <% } %>
                                     <% if (xblockInfo.isDuplicable()) { %>
                                         <li class="nav-item">
diff --git a/cms/templates/widgets/header.html b/cms/templates/widgets/header.html
index 6dd94ec78c55..14d054344c21 100644
--- a/cms/templates/widgets/header.html
+++ b/cms/templates/widgets/header.html
@@ -125,12 +125,12 @@ <h3 class="title"><span class="label"><span class="label-prefix sr">${_("Course"
                   % endif
                   %if not files_uploads_mfe_enabled:
                   <li class="nav-item nav-course-courseware-uploads">
-                    <a href="${assets_url}">${_("Files & Uploads")}</a>
+                    <a href="${assets_url}">${_("Files")}</a>
                   </li>
                   %endif
                   %if files_uploads_mfe_enabled:
                   <li class="nav-item nav-course-courseware-uploads">
-                    <a href="${get_files_uploads_url(course_key)}">${_("Files & Uploads")}</a>
+                    <a href="${get_files_uploads_url(course_key)}">${_("Files")}</a>
                   </li>
                   %endif
                   % if not pages_and_resources_mfe_enabled:
diff --git a/cms/urls.py b/cms/urls.py
index a949c086eaef..973311b1c271 100644
--- a/cms/urls.py
+++ b/cms/urls.py
@@ -339,10 +339,13 @@
 
 # Content tagging
 urlpatterns += [
-    path('api/content_tagging/', include(('openedx.core.djangoapps.content_tagging.urls'))),
+    path('api/content_tagging/', include(('openedx.core.djangoapps.content_tagging.urls', 'content_tagging'))),
 ]
 
-# studio-content-api specific API docs (using drf-spectacular and openapi-v3)
+# Authoring-api specific API docs (using drf-spectacular and openapi-v3).
+# This is separate from and in addition to the full studio swagger documentation already existing at /api-docs.
+# Custom settings are provided in SPECTACULAR_SETTINGS in cms/envs/common.py.
+# Filter function in cms/lib/spectacular.py determines paths that are swagger-documented.
 urlpatterns += [
     re_path('^cms-api/ui/', SpectacularSwaggerView.as_view(url_name='schema'), name='swagger-ui'),
     re_path('^cms-api/schema/', SpectacularAPIView.as_view(), name='schema'),
diff --git a/common/djangoapps/course_modes/tests/test_admin.py b/common/djangoapps/course_modes/tests/test_admin.py
index 52640dc52fe5..25b6558d24ab 100644
--- a/common/djangoapps/course_modes/tests/test_admin.py
+++ b/common/djangoapps/course_modes/tests/test_admin.py
@@ -54,7 +54,7 @@ def test_expiration_timezone(self):
             '_expiration_datetime_1': expiration.time(),
         }
 
-        self.client.login(username=user.username, password='test')
+        self.client.login(username=user.username, password=self.TEST_PASSWORD)
 
         # Create a new course mode from django admin page
         response = self.client.post(reverse('admin:course_modes_coursemode_add'), data=data)
diff --git a/common/djangoapps/student/auth.py b/common/djangoapps/student/auth.py
index abb98dcaffdc..fb2999eca98d 100644
--- a/common/djangoapps/student/auth.py
+++ b/common/djangoapps/student/auth.py
@@ -93,9 +93,16 @@ def get_user_permissions(user, course_key, org=None):
         return all_perms
     if course_key and user_has_role(user, CourseInstructorRole(course_key)):
         return all_perms
-    # Limited Course Staff does not have access to Studio.
+    # HACK: Limited Staff should not have studio read access. However, since many LMS views depend on the
+    #  `has_course_author_access` check and `course_author_access_required` decorator, we have to allow write access
+    #  until the permissions become more granular. For example, there could be STUDIO_VIEW_COHORTS and
+    #  STUDIO_EDIT_COHORTS specifically for the cohorts endpoint, which is used to display the "Cohorts" tab of the
+    #  Instructor Dashboard.
+    #  The permissions matrix from the RBAC project (https://github.com/openedx/platform-roadmap/issues/246) shows that
+    #  the LMS and Studio permissions will be separated as a part of this project. Once this is done (and this code is
+    #  not removed during its implementation), we can replace the Limited Staff permissions with more granular ones.
     if course_key and user_has_role(user, CourseLimitedStaffRole(course_key)):
-        return STUDIO_NO_PERMISSIONS
+        return STUDIO_EDIT_CONTENT
     # Staff have all permissions except EDIT_ROLES:
     if OrgStaffRole(org=org).has_user(user) or (course_key and user_has_role(user, CourseStaffRole(course_key))):
         return STUDIO_VIEW_USERS | STUDIO_EDIT_CONTENT | STUDIO_VIEW_CONTENT
diff --git a/common/djangoapps/student/handlers.py b/common/djangoapps/student/handlers.py
deleted file mode 100644
index 6dc841f98fa0..000000000000
--- a/common/djangoapps/student/handlers.py
+++ /dev/null
@@ -1,25 +0,0 @@
-"""
-Handlers for student
-"""
-from django.conf import settings
-from django.dispatch import receiver
-
-from openedx_events.event_bus import get_producer
-from openedx_events.learning.signals import (
-    COURSE_UNENROLLMENT_COMPLETED,
-)
-
-
-@receiver(COURSE_UNENROLLMENT_COMPLETED)
-def course_unenrollment_receiver(sender, signal, **kwargs):
-    """
-    Removes user notification preference when user un-enrolls from the course
-    """
-    if settings.FEATURES.get("ENABLE_SEND_ENROLLMENT_EVENTS_OVER_BUS"):
-        get_producer().send(
-            signal=COURSE_UNENROLLMENT_COMPLETED,
-            topic=getattr(settings, "EVENT_BUS_ENROLLMENT_LIFECYCLE_TOPIC", "course-unenrollment-lifecycle"),
-            event_key_field='enrollment.course.course_key',
-            event_data={'enrollment': kwargs.get('enrollment')},
-            event_metadata=kwargs.get('metadata')
-        )
diff --git a/common/djangoapps/student/management/commands/populate_users_emails_on_braze.py b/common/djangoapps/student/management/commands/populate_users_emails_on_braze.py
new file mode 100644
index 000000000000..6c13392d224b
--- /dev/null
+++ b/common/djangoapps/student/management/commands/populate_users_emails_on_braze.py
@@ -0,0 +1,139 @@
+""" Management command to add user emails data on Braze. """
+import logging
+import time
+
+from braze.client import BrazeClient
+from braze.exceptions import BrazeClientError
+from django.conf import settings
+from django.contrib.auth import get_user_model
+from django.core.management.base import BaseCommand
+
+from common.djangoapps.util.query import use_read_replica_if_available
+
+User = get_user_model()
+
+MARKETING_EMAIL_ATTRIBUTE_NAME = 'is_marketable'
+TRACK_USER_COMPONENT_CHUNK_SIZE = 75
+
+logger = logging.getLogger(__name__)
+
+
+class Command(BaseCommand):
+    """
+    Command to add user email address on Braze against a user_id.
+    Example usage:
+        $ ./manage.py lms populate_user_emails_on_braze
+    """
+    help = """
+        Updates user accounts with email addresses on braze.
+        """
+
+    def add_arguments(self, parser):
+        """
+        Function to get command arguments
+        """
+        parser.add_argument(
+            '--batch-delay',
+            type=float,
+            dest='batch_delay',
+            default=0.5,
+            help='Time delay in seconds between each iteration'
+        )
+        parser.add_argument(
+            '--batch-size',
+            type=int,
+            dest='batch_size',
+            default=10000,
+            help='Batch size'
+        )
+        parser.add_argument(
+            '--starting-user-id',
+            type=int,
+            dest='starting_user_id',
+            default=0,
+            help='Starting user id to process a specific batch of users. '
+                 'Both start and end id should be provided.',
+        )
+        parser.add_argument(
+            '--ending-user-id',
+            type=int,
+            dest='ending_user_id',
+            default=0,
+            help='Ending user id (inclusive) to process a specific batch of users. '
+                 'Both start and end id should be provided.',
+        )
+
+    def __init__(self):
+        super().__init__()
+        self.braze_client = BrazeClient(
+            api_key=settings.EDX_BRAZE_API_KEY,
+            api_url=settings.EDX_BRAZE_API_SERVER,
+            app_id='',
+        )
+
+    @staticmethod
+    def _chunks(users, chunk_size=TRACK_USER_COMPONENT_CHUNK_SIZE):
+        """
+        Yields successive chunks of users. The size of each chunk is determined by
+        TRACK_USER_COMPONENT_CHUNK_SIZE which is set to 75.
+        Reference: https://www.braze.com/docs/api/endpoints/user_data/post_user_track/
+        """
+        for index in range(0, len(users), chunk_size):
+            yield users[index:index + chunk_size]
+
+    def _get_user_batch(self, batch_start_id, batch_end_id):
+        """
+        This returns the batch of users.
+        """
+        query = User.objects.filter(
+            id__gte=batch_start_id, id__lt=batch_end_id,
+        ).select_related('profile').values_list(
+            'id', 'email', named=True,
+        ).order_by('id')
+
+        return use_read_replica_if_available(query)
+
+    def _update_braze_attributes(self, users):
+        """
+        Sends Braze API request to update user account.
+        Fields sent using the API include:
+            - external_id (user_id)
+            - email
+        """
+        attributes = []
+        for user in users:
+            attributes.append(
+                {
+                    "external_id": user.id,
+                    "email": user.email,
+                }
+            )
+
+        try:
+            self.braze_client.track_user(attributes=attributes)
+        except BrazeClientError as error:
+            logger.error(f'Failed to update attributes. Error: {error}')
+
+    def handle(self, *args, **options):
+        """
+        Handler to run the command.
+        """
+        sleep_time = options['batch_delay']
+        batch_size = options['batch_size']
+        starting_user_id = options['starting_user_id']
+        ending_user_id = options['ending_user_id']
+
+        all_users_query = use_read_replica_if_available(User.objects)
+        total_users_count = ending_user_id if ending_user_id else all_users_query.count()
+
+        for index in range(starting_user_id, total_users_count + 1, batch_size):
+            users = self._get_user_batch(index, index + batch_size)
+            logger.info(f'Processing users with user ids in {index} - {(index + batch_size) - 1} range')
+
+            # Force evaluating the query to avoid multiple hits to db
+            # when we evaluate the chunks.
+            evaluated_users = list(users)
+            for user_chunk in self._chunks(evaluated_users):
+                self._update_braze_attributes(user_chunk)
+
+            time.sleep(sleep_time)
diff --git a/common/djangoapps/student/management/tests/test_populate_users_emails_on_braze.py b/common/djangoapps/student/management/tests/test_populate_users_emails_on_braze.py
new file mode 100644
index 000000000000..8d8ad31c4c38
--- /dev/null
+++ b/common/djangoapps/student/management/tests/test_populate_users_emails_on_braze.py
@@ -0,0 +1,91 @@
+"""
+Unittests for populate_marketing_opt_in_user_attribute management command.
+"""
+from unittest.mock import patch, MagicMock
+
+from braze.exceptions import BrazeClientError
+from django.core.management import call_command
+from django.test import TestCase
+from testfixtures import LogCapture
+
+from common.djangoapps.student.tests.factories import UserFactory
+from openedx.core.djangolib.testing.utils import skip_unless_lms
+
+LOGGER_NAME = 'common.djangoapps.student.management.commands.populate_users_emails_on_braze'
+
+
+@skip_unless_lms
+class TestPopulateUsersEmailsOnBraze(TestCase):
+    """
+    Tests for PopulateUsersEmailsOnBraze management command.
+    """
+
+    @classmethod
+    def setUpClass(cls):
+        super().setUpClass()
+        for index in range(15):
+            user = UserFactory()
+
+    @patch('common.djangoapps.student.management.commands.populate_users_emails_on_braze.BrazeClient.track_user')
+    def test_command_updates_users_on_braze(self, track_user):
+        """
+        Test that Braze API is called successfully for all users
+        """
+        track_user.return_value = MagicMock()
+        call_command('populate_users_emails_on_braze', batch_delay=0)
+        assert track_user.called
+
+    @patch('common.djangoapps.student.management.commands.populate_users_emails_on_braze.BrazeClient.track_user')
+    def test_logs_for_success(self, track_user):
+        """
+        Test logs for a successful run of updating user accounts on Braze
+        """
+        track_user.return_value = MagicMock()
+        with LogCapture(LOGGER_NAME) as log:
+            call_command(
+                'populate_users_emails_on_braze',
+                batch_size=5,
+                batch_delay=0,
+            )
+            log.check(
+                (LOGGER_NAME, 'INFO', 'Processing users with user ids in 0 - 4 range'),
+                (LOGGER_NAME, 'INFO', 'Processing users with user ids in 5 - 9 range'),
+                (LOGGER_NAME, 'INFO', 'Processing users with user ids in 10 - 14 range'),
+                (LOGGER_NAME, 'INFO', 'Processing users with user ids in 15 - 19 range'),
+            )
+
+    @patch('common.djangoapps.student.management.commands.populate_users_emails_on_braze.BrazeClient.track_user')
+    def test_logs_for_failure(self, track_user):
+        """
+        Test logs for when the update to Braze fails
+        """
+        track_user.side_effect = BrazeClientError('Update to attributes failed.')
+        with LogCapture(LOGGER_NAME) as log:
+            call_command(
+                'populate_users_emails_on_braze',
+                batch_size=5,
+                batch_delay=0,
+            )
+            log.check_present(
+                (LOGGER_NAME, 'ERROR', 'Failed to update attributes. Error: Update to attributes failed.'),
+            )
+
+    @patch('common.djangoapps.student.management.commands.populate_users_emails_on_braze.BrazeClient.track_user')
+    def test_running_a_specific_batch(self, track_user):
+        """
+        Test running command for a specific batch of users
+        """
+        track_user.return_value = MagicMock()
+        with LogCapture(LOGGER_NAME) as log:
+            call_command(
+                'populate_users_emails_on_braze',
+                batch_size=5,
+                batch_delay=0,
+                starting_user_id=2,
+                ending_user_id=13,
+            )
+            log.check(
+                (LOGGER_NAME, 'INFO', 'Processing users with user ids in 2 - 6 range'),
+                (LOGGER_NAME, 'INFO', 'Processing users with user ids in 7 - 11 range'),
+                (LOGGER_NAME, 'INFO', 'Processing users with user ids in 12 - 16 range'),
+            )
diff --git a/common/djangoapps/student/models/course_enrollment.py b/common/djangoapps/student/models/course_enrollment.py
index f44bd934ee57..d89a8d967a00 100644
--- a/common/djangoapps/student/models/course_enrollment.py
+++ b/common/djangoapps/student/models/course_enrollment.py
@@ -225,12 +225,6 @@ def enrollment_counts(self, course_id):
         enroll_dict['total'] = total
         return enroll_dict
 
-    def enrolled_and_dropped_out_users(self, course_id):
-        """Return a queryset of Users in the course."""
-        return User.objects.filter(
-            courseenrollment__course_id=course_id
-        )
-
 
 # Named tuple for fields pertaining to the state of
 # CourseEnrollment for a user in a course.  This type
@@ -287,7 +281,7 @@ def course_price(self):
     objects = CourseEnrollmentManager()
 
     # cache key format e.g enrollment.<username>.<course_key>.mode = 'honor'
-    COURSE_ENROLLMENT_CACHE_KEY = "enrollment.{}.{}.mode"  # TODO Can this be removed?  It doesn't seem to be used.
+    COURSE_ENROLLMENT_CACHE_KEY = "enrollment.{}.{}.mode"
 
     MODE_CACHE_NAMESPACE = 'CourseEnrollment.mode_and_active'
 
@@ -330,7 +324,7 @@ def get_or_create_enrollment(cls, user, course_key):
                attribute), this method will automatically save it before
                adding an enrollment for it.
 
-        `course_id` is our usual course_id string (e.g. "edX/Test101/2013_Fall)
+        `course_key` must be a opaque_keys CourseKey object.
 
         It is expected that this method is called from a method which has already
         verified the user authentication and access.
@@ -449,7 +443,7 @@ def update_enrollment(self, mode=None, is_active=None, skip_refund=False, enterp
 
         if activation_changed or mode_changed:
             self.save()
-            self._update_enrollment_in_request_cache(
+            self._update_enrollment_state_in_request_cache(
                 self.user,
                 self.course_id,
                 CourseEnrollmentState(self.mode, self.is_active),
@@ -1337,7 +1331,7 @@ def _get_enrollment_state(cls, user, course_key):
                 enrollment_state = CourseEnrollmentState(record.mode, record.is_active)
             except cls.DoesNotExist:
                 enrollment_state = CourseEnrollmentState(None, None)
-            cls._update_enrollment_in_request_cache(user, course_key, enrollment_state)
+            cls._update_enrollment_state_in_request_cache(user, course_key, enrollment_state)
         return enrollment_state
 
     @classmethod
@@ -1354,7 +1348,7 @@ def bulk_fetch_enrollment_states(cls, users, course_key):
         cache = cls._get_mode_active_request_cache()  # lint-amnesty, pylint: disable=redefined-outer-name
         for record in records:
             enrollment_state = CourseEnrollmentState(record.mode, record.is_active)
-            cls._update_enrollment(cache, record.user.id, course_key, enrollment_state)
+            cls._update_enrollment_state_in_cache(cache, record.user.id, course_key, enrollment_state)
 
     @classmethod
     def _get_mode_active_request_cache(cls):
@@ -1372,15 +1366,16 @@ def _get_enrollment_in_request_cache(cls, user, course_key):
         return cls._get_mode_active_request_cache().get((user.id, course_key))
 
     @classmethod
-    def _update_enrollment_in_request_cache(cls, user, course_key, enrollment_state):
+    def _update_enrollment_state_in_request_cache(cls, user, course_key, enrollment_state):
         """
         Updates the cached value for the user's enrollment in the
         request cache.
         """
-        cls._update_enrollment(cls._get_mode_active_request_cache(), user.id, course_key, enrollment_state)
+        cls._update_enrollment_state_in_cache(cls._get_mode_active_request_cache(),
+                                              user.id, course_key, enrollment_state)
 
     @classmethod
-    def _update_enrollment(cls, cache, user_id, course_key, enrollment_state):  # lint-amnesty, pylint: disable=redefined-outer-name
+    def _update_enrollment_state_in_cache(cls, cache, user_id, course_key, enrollment_state):  # lint-amnesty, pylint: disable=redefined-outer-name
         """
         Updates the cached value for the user's enrollment in the
         given cache.
diff --git a/common/djangoapps/student/roles.py b/common/djangoapps/student/roles.py
index c2fd4564e420..7bbd0cf92454 100644
--- a/common/djangoapps/student/roles.py
+++ b/common/djangoapps/student/roles.py
@@ -7,6 +7,7 @@
 import logging
 from abc import ABCMeta, abstractmethod
 from collections import defaultdict
+from contextlib import contextmanager
 
 from django.contrib.auth.models import User  # lint-amnesty, pylint: disable=imported-auth-user
 from opaque_keys.edx.django.models import CourseKeyField
@@ -44,6 +45,21 @@ def register_access_role(cls):
     return cls
 
 
+@contextmanager
+def strict_role_checking():
+    """
+    Context manager that temporarily disables role inheritance.
+
+    You may want to use it to check if a user has a base role. For example, if a user has `CourseLimitedStaffRole`,
+    by enclosing `has_role` call with this context manager, you can check it has the `CourseStaffRole` too. This is
+    useful when derived roles have less permissions than their base roles, but users can have both roles at the same.
+    """
+    OLD_ACCESS_ROLES_INHERITANCE = ACCESS_ROLES_INHERITANCE.copy()
+    ACCESS_ROLES_INHERITANCE.clear()
+    yield
+    ACCESS_ROLES_INHERITANCE.update(OLD_ACCESS_ROLES_INHERITANCE)
+
+
 class BulkRoleCache:  # lint-amnesty, pylint: disable=missing-class-docstring
     CACHE_NAMESPACE = "student.roles.BulkRoleCache"
     CACHE_KEY = 'roles_by_user'
@@ -78,7 +94,7 @@ def __init__(self, user):
             )
 
     @staticmethod
-    def _get_roles(role):
+    def get_roles(role):
         """
         Return the roles that should have the same permissions as the specified role.
         """
@@ -90,7 +106,7 @@ def has_role(self, role, course_id, org):
         or a role that inherits from the specified role, course_id and org.
         """
         return any(
-            access_role.role in self._get_roles(role) and
+            access_role.role in self.get_roles(role) and
             access_role.course_id == course_id and
             access_role.org == org
             for access_role in self._roles
@@ -463,11 +479,11 @@ def remove_courses(self, *course_keys):
 
     def courses_with_role(self):
         """
-        Return a django QuerySet for all of the courses with this user x role. You can access
+        Return a django QuerySet for all of the courses with this user x (or derived from x) role. You can access
         any of these properties on each result record:
         * user (will be self.user--thus uninteresting)
         * org
         * course_id
         * role (will be self.role--thus uninteresting)
         """
-        return CourseAccessRole.objects.filter(role=self.role, user=self.user)
+        return CourseAccessRole.objects.filter(role__in=RoleCache.get_roles(self.role), user=self.user)
diff --git a/common/djangoapps/student/tests/factories.py b/common/djangoapps/student/tests/factories.py
index 708082412516..27e245288dd6 100644
--- a/common/djangoapps/student/tests/factories.py
+++ b/common/djangoapps/student/tests/factories.py
@@ -35,7 +35,7 @@
 from openedx.core.djangoapps.content.course_overviews.models import CourseOverview
 from openedx.core.djangoapps.content.course_overviews.tests.factories import CourseOverviewFactory
 
-TEST_PASSWORD = 'test'
+TEST_PASSWORD = 'Password1234'
 
 
 class GroupFactory(DjangoModelFactory):  # lint-amnesty, pylint: disable=missing-class-docstring
@@ -81,7 +81,7 @@ class Meta:
         model = User
         django_get_or_create = ('email', 'username')
 
-    _DEFAULT_PASSWORD = 'test'
+    _DEFAULT_PASSWORD = 'Password1234'
 
     username = factory.Sequence('robot{}'.format)
     email = factory.Sequence('robot+test+{}@edx.org'.format)
diff --git a/common/djangoapps/student/tests/test_admin_views.py b/common/djangoapps/student/tests/test_admin_views.py
index 5c6350c2f0ce..2914bcd61c43 100644
--- a/common/djangoapps/student/tests/test_admin_views.py
+++ b/common/djangoapps/student/tests/test_admin_views.py
@@ -53,7 +53,7 @@ def test_save_valid_data(self):
             'email': self.user.email
         }
 
-        self.client.login(username=self.user.username, password='test')
+        self.client.login(username=self.user.username, password=self.TEST_PASSWORD)
 
         # # adding new role from django admin page
         response = self.client.post(reverse('admin:student_courseaccessrole_add'), data=data)
@@ -78,7 +78,7 @@ def test_save_without_org_and_course_data(self):
             'course_id': str(self.course.id)
         }
 
-        self.client.login(username=self.user.username, password='test')
+        self.client.login(username=self.user.username, password=self.TEST_PASSWORD)
 
         # # adding new role from django admin page
         response = self.client.post(reverse('admin:student_courseaccessrole_add'), data=data)
@@ -96,7 +96,7 @@ def test_save_with_course_only(self):
 
         }
 
-        self.client.login(username=self.user.username, password='test')
+        self.client.login(username=self.user.username, password=self.TEST_PASSWORD)
 
         # # adding new role from django admin page
         response = self.client.post(reverse('admin:student_courseaccessrole_add'), data=data)
@@ -115,7 +115,7 @@ def test_save_with_org_only(self):
 
         }
 
-        self.client.login(username=self.user.username, password='test')
+        self.client.login(username=self.user.username, password=self.TEST_PASSWORD)
 
         # # adding new role from django admin page
         response = self.client.post(reverse('admin:student_courseaccessrole_add'), data=data)
@@ -136,7 +136,7 @@ def test_save_with_invalid_course(self):
             'email': email
         }
 
-        self.client.login(username=self.user.username, password='test')
+        self.client.login(username=self.user.username, password=self.TEST_PASSWORD)
 
         # Adding new role with invalid data
         response = self.client.post(reverse('admin:student_courseaccessrole_add'), data=data)
@@ -163,7 +163,7 @@ def test_save_valid_course_invalid_org(self):
             'email': self.user.email
         }
 
-        self.client.login(username=self.user.username, password='test')
+        self.client.login(username=self.user.username, password=self.TEST_PASSWORD)
 
         # # adding new role from django admin page
         response = self.client.post(reverse('admin:student_courseaccessrole_add'), data=data)
@@ -230,7 +230,7 @@ def setUp(self):
             user=self.user,
             course_id=self.course.id,  # pylint: disable=no-member
         )
-        self.client.login(username=self.user.username, password='test')
+        self.client.login(username=self.user.username, password=self.TEST_PASSWORD)
 
     @ddt.data(*ADMIN_URLS)
     @ddt.unpack
@@ -324,13 +324,14 @@ class LoginFailuresAdminTest(TestCase):
     def setUpClass(cls):
         """Setup class"""
         super().setUpClass()
-        cls.user = UserFactory.create(username='§', is_staff=True, is_superuser=True)
+        cls.TEST_PASSWORD = 'Password1234'
+        cls.user = UserFactory.create(username='§', password=cls.TEST_PASSWORD, is_staff=True, is_superuser=True)
         cls.user.save()
 
     def setUp(self):
         """Setup."""
         super().setUp()
-        self.client.login(username=self.user.username, password='test')
+        self.client.login(username=self.user.username, password=self.TEST_PASSWORD)
         self.user2 = UserFactory.create(username='Zażółć gęślą jaźń')
         self.user_lockout_until = datetime.datetime.now(UTC)
         LoginFailures.objects.create(user=self.user, failure_count=10, lockout_until=self.user_lockout_until)
diff --git a/common/djangoapps/student/tests/test_authz.py b/common/djangoapps/student/tests/test_authz.py
index a7a3694d3489..1c79780e88c1 100644
--- a/common/djangoapps/student/tests/test_authz.py
+++ b/common/djangoapps/student/tests/test_authz.py
@@ -285,14 +285,14 @@ def test_remove_user_from_course_group_permission_denied(self):
         with pytest.raises(PermissionDenied):
             remove_users(self.staff, CourseStaffRole(self.course_key), another_staff)
 
-    def test_no_limited_staff_read_or_write_access(self):
+    def test_limited_staff_no_studio_read_access(self):
         """
-        Test that course limited staff have no read or write access.
+        Verifies that course limited staff have no read, but have write access.
         """
         add_users(self.global_admin, CourseLimitedStaffRole(self.course_key), self.limited_staff)
 
         assert not has_studio_read_access(self.limited_staff, self.course_key)
-        assert not has_studio_write_access(self.limited_staff, self.course_key)
+        assert has_studio_write_access(self.limited_staff, self.course_key)
 
 
 class CourseOrgGroupTest(TestCase):
diff --git a/common/djangoapps/student/tests/test_bulk_email_settings.py b/common/djangoapps/student/tests/test_bulk_email_settings.py
index d9bfd15621ca..308ccf66e09d 100644
--- a/common/djangoapps/student/tests/test_bulk_email_settings.py
+++ b/common/djangoapps/student/tests/test_bulk_email_settings.py
@@ -33,7 +33,7 @@ def setUp(self):
         # Create student account
         student = UserFactory.create()
         CourseEnrollmentFactory.create(user=student, course_id=self.course.id)
-        self.client.login(username=student.username, password="test")
+        self.client.login(username=student.username, password=self.TEST_PASSWORD)
 
         self.url = reverse('dashboard')
         # URL for email settings modal
diff --git a/common/djangoapps/student/tests/test_email.py b/common/djangoapps/student/tests/test_email.py
index 7f1287fba048..bcede1821376 100644
--- a/common/djangoapps/student/tests/test_email.py
+++ b/common/djangoapps/student/tests/test_email.py
@@ -136,7 +136,7 @@ def _create_account(self):
         params = {
             'username': 'test_user',
             'email': 'test_user@example.com',
-            'password': 'edx',
+            'password': 'Password1234',
             'name': 'Test User',
             'honor_code': True,
             'terms_of_service': True
@@ -319,7 +319,7 @@ def setUp(self, tracker='common.djangoapps.student.views.management.tracker'):
         self.new_email = 'new.email@edx.org'
         self.req_factory = RequestFactory()
         self.request = self.req_factory.post('unused_url', data={
-            'password': 'test',
+            'password': 'Password1234',
             'new_email': self.new_email
         })
         self.request.user = self.user
@@ -628,7 +628,7 @@ def setUp(self, tracker='common.djangoapps.student.views.management.tracker'):
         self.new_secondary_email = 'new.secondary.email@edx.org'
         self.req_factory = RequestFactory()
         self.request = self.req_factory.post('unused_url', data={
-            'password': 'test',
+            'password': 'Password1234',
             'new_email': self.new_secondary_email
         })
         self.request.user = self.user
diff --git a/common/djangoapps/student/tests/test_filters.py b/common/djangoapps/student/tests/test_filters.py
index 6e429fd39a5c..376595a8507b 100644
--- a/common/djangoapps/student/tests/test_filters.py
+++ b/common/djangoapps/student/tests/test_filters.py
@@ -316,7 +316,7 @@ class StudentDashboardFiltersTest(ModuleStoreTestCase):
     def setUp(self):  # pylint: disable=arguments-differ
         super().setUp()
         self.user = UserFactory()
-        self.client.login(username=self.user.username, password="test")
+        self.client.login(username=self.user.username, password=self.TEST_PASSWORD)
         self.dashboard_url = reverse("dashboard")
         self.first_course = CourseFactory.create(
             org="test1", course="course1", display_name="run1",
diff --git a/common/djangoapps/student/tests/test_handlers.py b/common/djangoapps/student/tests/test_handlers.py
deleted file mode 100644
index bd8d6a9baf47..000000000000
--- a/common/djangoapps/student/tests/test_handlers.py
+++ /dev/null
@@ -1,67 +0,0 @@
-"""
-Unit tests for event bus tests for course unenrollments
-"""
-
-import unittest
-from datetime import datetime, timezone
-from unittest import mock
-from uuid import uuid4
-
-from django.test.utils import override_settings
-from common.djangoapps.student.handlers import course_unenrollment_receiver
-from common.djangoapps.student.tests.factories import (
-    UserFactory,
-    CourseEnrollmentFactory,
-)
-
-from openedx_events.data import EventsMetadata
-from openedx_events.learning.signals import COURSE_UNENROLLMENT_COMPLETED
-from pytest import mark
-
-
-@mark.django_db
-class UnenrollmentEventBusTests(unittest.TestCase):
-    """
-    Tests for unenrollment events that interact with the event bus.
-    """
-    @override_settings(ENABLE_SEND_ENROLLMENT_EVENTS_OVER_BUS=False)
-    @mock.patch('common.djangoapps.student.handlers.get_producer', autospec=True)
-    def test_event_disabled(self, mock_producer):
-        """
-        Test to verify that we do not push `CERTIFICATE_CREATED` events to the event bus if the
-        `SEND_CERTIFICATE_CREATED_SIGNAL` setting is disabled.
-        """
-        course_unenrollment_receiver(None, None)
-        mock_producer.assert_not_called()
-
-    @override_settings(FEATURES={'ENABLE_SEND_ENROLLMENT_EVENTS_OVER_BUS': True})
-    @mock.patch('common.djangoapps.student.handlers.get_producer', autospec=True)
-    def test_event_enabled(self, mock_producer):
-        """
-        Test to verify that we push `COURSE_UNENROLLMENT_COMPLETED` events to the event bus.
-        """
-        user = UserFactory()
-        enrollment = CourseEnrollmentFactory(user=user)
-
-        event_metadata = EventsMetadata(
-            event_type=COURSE_UNENROLLMENT_COMPLETED.event_type,
-            id=uuid4(),
-            minorversion=0,
-            source='openedx/lms/web',
-            sourcehost='lms.test',
-            time=datetime.now(timezone.utc)
-        )
-
-        event_kwargs = {
-            'enrollment': enrollment,
-            'metadata': event_metadata
-        }
-        course_unenrollment_receiver(None, COURSE_UNENROLLMENT_COMPLETED, **event_kwargs)
-
-        # verify that the data sent to the event bus matches what we expect
-        print(mock_producer.return_value)
-        print(mock_producer.return_value.send.call_args)
-        data = mock_producer.return_value.send.call_args.kwargs
-        assert data['event_data']['enrollment'] == enrollment
-        assert data['topic'] == 'course-unenrollment-lifecycle'
-        assert data['event_key_field'] == 'enrollment.course.course_key'
diff --git a/common/djangoapps/student/tests/test_retirement.py b/common/djangoapps/student/tests/test_retirement.py
index a7e5fac86571..ffeb1af14fa2 100644
--- a/common/djangoapps/student/tests/test_retirement.py
+++ b/common/djangoapps/student/tests/test_retirement.py
@@ -260,7 +260,7 @@ def setUp(self):
             'username': 'username',
             'email': 'foo_bar' + '@bar.com',
             'name': 'foo bar',
-            'password': '123',
+            'password': 'Password1234',
             'terms_of_service': 'true',
             'honor_code': 'true',
         }
diff --git a/common/djangoapps/student/tests/test_userstanding.py b/common/djangoapps/student/tests/test_userstanding.py
index 832127e474ed..67fcebda28f6 100644
--- a/common/djangoapps/student/tests/test_userstanding.py
+++ b/common/djangoapps/student/tests/test_userstanding.py
@@ -43,7 +43,7 @@ def setUp(self):
             (self.non_staff, self.non_staff_client),
             (self.admin, self.admin_client),
         ]:
-            client.login(username=user.username, password='test')
+            client.login(username=user.username, password='Password1234')
 
         UserStandingFactory.create(
             user=self.bad_user,
diff --git a/common/djangoapps/student/tests/test_views.py b/common/djangoapps/student/tests/test_views.py
index b9518efa0446..1230f8320a75 100644
--- a/common/djangoapps/student/tests/test_views.py
+++ b/common/djangoapps/student/tests/test_views.py
@@ -49,7 +49,6 @@
 from xmodule.modulestore.tests.django_utils import SharedModuleStoreTestCase  # lint-amnesty, pylint: disable=wrong-import-order
 from xmodule.modulestore.tests.factories import CourseFactory, BlockFactory  # lint-amnesty, pylint: disable=wrong-import-order
 
-PASSWORD = 'test'
 TOMORROW = now() + timedelta(days=1)
 ONE_WEEK_AGO = now() - timedelta(weeks=1)
 THREE_YEARS_FROM_NOW = now() + timedelta(days=(365 * 3))
@@ -81,7 +80,7 @@ def setUp(self):
         self.user = UserFactory()
         self.enrollment = CourseEnrollmentFactory(course_id=self.course.id, user=self.user)
         self.cert_status = 'processing'
-        self.client.login(username=self.user.username, password=PASSWORD)
+        self.client.login(username=self.user.username, password=self.TEST_PASSWORD)
 
     def mock_cert(self, _user, _course_overview):
         """ Return a preset certificate status. """
@@ -212,7 +211,7 @@ def setUp(self):
         """
         super().setUp()
         self.user = UserFactory()
-        self.client.login(username=self.user.username, password=PASSWORD)
+        self.client.login(username=self.user.username, password=self.TEST_PASSWORD)
         self.path = reverse('dashboard')
 
     def set_course_sharing_urls(self, set_marketing, set_social_sharing):
@@ -1018,7 +1017,7 @@ class TestCourseDashboardNoticesRedirects(SharedModuleStoreTestCase):
     def setUp(self):
         super().setUp()
         self.user = UserFactory()
-        self.client.login(username=self.user.username, password=PASSWORD)
+        self.client.login(username=self.user.username, password=self.TEST_PASSWORD)
         self.path = reverse('dashboard')
 
     def test_check_for_unacknowledged_notices(self):
diff --git a/common/djangoapps/student/tests/tests.py b/common/djangoapps/student/tests/tests.py
index b41ad2f856d6..9e61095260b6 100644
--- a/common/djangoapps/student/tests/tests.py
+++ b/common/djangoapps/student/tests/tests.py
@@ -15,6 +15,7 @@
 from django.test import TestCase, override_settings
 from django.test.client import Client
 from django.urls import reverse
+from edx_toggles.toggles.testutils import override_waffle_switch
 from markupsafe import escape
 from opaque_keys.edx.keys import CourseKey
 from opaque_keys.edx.locations import CourseLocator
@@ -33,6 +34,7 @@
     user_by_anonymous_id
 )
 from common.djangoapps.student.tests.factories import CourseEnrollmentFactory, UserFactory
+from common.djangoapps.student.toggles import REDIRECT_TO_COURSEWARE_AFTER_ENROLLMENT
 from common.djangoapps.student.views import complete_course_mode_info
 from common.djangoapps.util.model_utils import USER_SETTINGS_CHANGED_EVENT_NAME
 from common.djangoapps.util.testing import EventTestMixin
@@ -278,7 +280,7 @@ class DashboardTest(ModuleStoreTestCase, TestVerificationBase):
     def setUp(self):
         super().setUp()
         self.course = CourseFactory.create()
-        self.user = UserFactory.create(username="jack", email="jack@fake.edx.org", password='test')
+        self.user = UserFactory.create(username="jack", email="jack@fake.edx.org", password=self.TEST_PASSWORD)
         self.client = Client()
         cache.clear()
 
@@ -307,7 +309,7 @@ def test_verification_status_visible(self):
         """
         Test that the certificate verification status for courses is visible on the dashboard.
         """
-        self.client.login(username="jack", password="test")
+        self.client.login(username="jack", password=self.TEST_PASSWORD)
         self._check_verification_status_on('verified', 'You&#39;re enrolled as a verified student')
         self._check_verification_status_on('honor', 'You&#39;re enrolled as an honor code student')
         self._check_verification_status_off('audit', '')
@@ -345,7 +347,7 @@ def test_verification_status_invisible(self):
         Test that the certificate verification status for courses is not visible on the dashboard
         if the verified certificates setting is off.
         """
-        self.client.login(username="jack", password="test")
+        self.client.login(username="jack", password=self.TEST_PASSWORD)
         self._check_verification_status_off('verified', 'You\'re enrolled as a verified student')
         self._check_verification_status_off('honor', 'You\'re enrolled as an honor code student')
         self._check_verification_status_off('audit', '')
@@ -371,7 +373,7 @@ def test_course_mode_info(self):
     @skip_unless_lms
     def test_linked_in_add_to_profile_btn_not_appearing_without_config(self):
         # Without linked-in config don't show Add Certificate to LinkedIn button
-        self.client.login(username="jack", password="test")
+        self.client.login(username="jack", password=self.TEST_PASSWORD)
 
         CourseModeFactory.create(
             course_id=self.course.id,
@@ -409,7 +411,7 @@ def test_linked_in_add_to_profile_btn_not_appearing_without_config(self):
     def test_linked_in_add_to_profile_btn_with_certificate(self):
         # If user has a certificate with valid linked-in config then Add Certificate to LinkedIn button
         # should be visible. and it has URL value with valid parameters.
-        self.client.login(username="jack", password="test")
+        self.client.login(username="jack", password=self.TEST_PASSWORD)
 
         linkedin_config = LinkedInAddToProfileConfiguration.objects.create(company_identifier='1337', enabled=True)
         CourseModeFactory.create(
@@ -480,7 +482,7 @@ def test_dashboard_metadata_caching(self):
         # Create a course and log in the user.
         # Creating a new course will trigger a publish event and the course will be cached
         test_course = CourseFactory.create(emit_signals=True)
-        self.client.login(username="jack", password="test")
+        self.client.login(username="jack", password=self.TEST_PASSWORD)
 
         with check_mongo_calls(0):
             CourseEnrollment.enroll(self.user, test_course.id)
@@ -495,7 +497,7 @@ def test_dashboard_metadata_caching(self):
 
     @skip_unless_lms
     def test_dashboard_header_nav_has_find_courses(self):
-        self.client.login(username="jack", password="test")
+        self.client.login(username="jack", password=self.TEST_PASSWORD)
         response = self.client.get(reverse("dashboard"))
 
         # "Explore courses" is shown in the side panel
@@ -542,7 +544,7 @@ def setUp(self):
         super().setUp()
         self.org = 'fakeX'
         self.course = CourseFactory.create(org=self.org)
-        self.user = UserFactory.create(username='jack', email='jack@fake.edx.org', password='test')
+        self.user = UserFactory.create(username='jack', email='jack@fake.edx.org', password=self.TEST_PASSWORD)
         CourseModeFactory.create(mode_slug='no-id-professional', course_id=self.course.id)
         CourseEnrollment.enroll(self.user, self.course.location.course_key, mode='no-id-professional')
         cache.clear()
@@ -564,7 +566,7 @@ def test_course_mode_visible(self, site_domain, site_configuration_values):
             'course_org_filter': self.org
         })
         self.set_up_site(site_domain, site_configuration_values)
-        self.client.login(username='jack', password='test')
+        self.client.login(username='jack', password=self.TEST_PASSWORD)
         response = self.client.get(reverse('dashboard'))
         self.assertContains(response, 'class="course professional"')
 
@@ -585,7 +587,7 @@ def test_course_mode_invisible(self, site_domain, site_configuration_values):
             'course_org_filter': self.org
         })
         self.set_up_site(site_domain, site_configuration_values)
-        self.client.login(username='jack', password='test')
+        self.client.login(username='jack', password=self.TEST_PASSWORD)
         response = self.client.get(reverse('dashboard'))
         self.assertNotContains(response, 'class="course professional"')
 
@@ -893,14 +895,15 @@ def test_change_enrollment_modes(self):
 
 
 @skip_unless_lms
+@ddt.ddt
 class ChangeEnrollmentViewTest(ModuleStoreTestCase):
     """Tests the student.views.change_enrollment view"""
 
     def setUp(self):
         super().setUp()
         self.course = CourseFactory.create()
-        self.user = UserFactory.create(password='secret')
-        self.client.login(username=self.user.username, password='secret')
+        self.user = UserFactory.create(password=self.TEST_PASSWORD)
+        self.client.login(username=self.user.username, password=self.TEST_PASSWORD)
         self.url = reverse('change_enrollment')
 
     def _enroll_through_view(self, course):
@@ -913,6 +916,17 @@ def _enroll_through_view(self, course):
         )
         return response
 
+    @ddt.data(
+        (True, 'courseware'),
+        (False, None),
+    )
+    @ddt.unpack
+    def test_enrollment_url(self, waffle_flag_enabled, returned_view):
+        with override_waffle_switch(REDIRECT_TO_COURSEWARE_AFTER_ENROLLMENT, waffle_flag_enabled):
+            response = self._enroll_through_view(self.course)
+        data = reverse(returned_view, args=[str(self.course.id)]) if returned_view else ''
+        assert response.content.decode('utf8') == data
+
     def test_enroll_as_default(self):
         """Tests that a student can successfully enroll through this view"""
         response = self._enroll_through_view(self.course)
@@ -1056,14 +1070,13 @@ def test_anonymous_id_secret_key_changes_result_in_diff_values_for_same_new_user
 class RelatedProgramsTests(ProgramsApiConfigMixin, SharedModuleStoreTestCase):
     """Tests verifying that related programs appear on the course dashboard."""
     maxDiff = None
-    password = 'test'
     related_programs_preface = 'Related Programs'
 
     @classmethod
     def setUpClass(cls):
         super().setUpClass()
 
-        cls.user = UserFactory()
+        cls.user = UserFactory(password=cls.TEST_PASSWORD)
         cls.course = CourseFactory()
         cls.enrollment = CourseEnrollmentFactory(user=cls.user, course_id=cls.course.id)  # pylint: disable=no-member
 
@@ -1073,7 +1086,7 @@ def setUp(self):
         self.url = reverse('dashboard')
 
         self.create_programs_config()
-        self.client.login(username=self.user.username, password=self.password)
+        self.client.login(username=self.user.username, password=self.TEST_PASSWORD)
 
         course_run = CourseRunFactory(key=str(self.course.id))  # pylint: disable=no-member
         course = CatalogCourseFactory(course_runs=[course_run])
diff --git a/common/djangoapps/student/toggles.py b/common/djangoapps/student/toggles.py
index 46e9b0408fbf..507f323a2a53 100644
--- a/common/djangoapps/student/toggles.py
+++ b/common/djangoapps/student/toggles.py
@@ -1,7 +1,7 @@
 """
 Toggles for Dashboard page.
 """
-from edx_toggles.toggles import WaffleFlag
+from edx_toggles.toggles import WaffleFlag, WaffleSwitch
 
 # Namespace for student waffle flags.
 WAFFLE_FLAG_NAMESPACE = 'student'
@@ -75,3 +75,21 @@ def should_show_2u_recommendations():
 
 def should_send_enrollment_email():
     return ENROLLMENT_CONFIRMATION_EMAIL.is_enabled()
+
+
+# Waffle flag to enable control redirecting after enrolment.
+# .. toggle_name: student.redirect_to_courseware_after_enrollment
+# .. toggle_implementation: WaffleSwitch
+# .. toggle_default: False
+# .. toggle_description: Redirect to courseware after enrollment instead of dashboard.
+# .. toggle_use_cases: open_edx
+# .. toggle_creation_date: 2023-02-06
+# .. toggle_target_removal_date: None
+# .. toggle_warning: None
+REDIRECT_TO_COURSEWARE_AFTER_ENROLLMENT = WaffleSwitch(
+    f'{WAFFLE_FLAG_NAMESPACE}.redirect_to_courseware_after_enrollment', __name__
+)
+
+
+def should_redirect_to_courseware_after_enrollment():
+    return REDIRECT_TO_COURSEWARE_AFTER_ENROLLMENT.is_enabled()
diff --git a/common/djangoapps/student/views/management.py b/common/djangoapps/student/views/management.py
index d131575193b4..cb3df1627fd9 100644
--- a/common/djangoapps/student/views/management.py
+++ b/common/djangoapps/student/views/management.py
@@ -38,6 +38,7 @@
 from rest_framework.decorators import api_view, authentication_classes, permission_classes
 from rest_framework.permissions import IsAuthenticated
 
+from common.djangoapps.student.toggles import should_redirect_to_courseware_after_enrollment
 from common.djangoapps.track import views as track_views
 from lms.djangoapps.bulk_email.models import Optout
 from common.djangoapps.course_modes.models import CourseMode
@@ -400,8 +401,10 @@ def change_enrollment(request, check_access=True):
                 reverse("course_modes_choose", kwargs={'course_id': str(course_id)})
             )
 
-        # Otherwise, there is only one mode available (the default)
-        return HttpResponse()
+        if should_redirect_to_courseware_after_enrollment():
+            return HttpResponse(reverse('courseware', args=[str(course_id)]))
+        else:
+            return HttpResponse()
     elif action == "unenroll":
         if configuration_helpers.get_value(
             "DISABLE_UNENROLLMENT",
diff --git a/common/djangoapps/terrain/stubs/lti.py b/common/djangoapps/terrain/stubs/lti.py
index c406da5e6ed3..46535abb9f80 100644
--- a/common/djangoapps/terrain/stubs/lti.py
+++ b/common/djangoapps/terrain/stubs/lti.py
@@ -13,7 +13,6 @@
 import base64
 import hashlib
 import logging
-import os
 import textwrap
 from unittest import mock
 from uuid import uuid4
@@ -78,7 +77,7 @@ def do_POST(self):
                         'callback_url': self.post_dict.get('lis_outcome_service_url').replace('https', 'http'),
                         'sourcedId': self.post_dict.get('lis_result_sourcedid')
                     }
-                host = os.environ.get('BOK_CHOY_HOSTNAME', self.server.server_address[0])
+                host = self.server.server_address[0]
                 submit_url = f'//{host}:{self.server.server_address[1]}'
                 content = self._create_content(status_message, submit_url)
                 self.send_response(200, content)
@@ -296,7 +295,7 @@ def _check_oauth_signature(self, params, client_signature):
 
         """
         client_secret = str(self.server.config.get('client_secret', self.DEFAULT_CLIENT_SECRET))
-        host = os.environ.get('BOK_CHOY_HOSTNAME', '127.0.0.1')
+        host = '127.0.0.1'
         port = self.server.server_address[1]
         lti_base = self.DEFAULT_LTI_ADDRESS.format(host=host, port=port)
         lti_endpoint = self.server.config.get('lti_endpoint', self.DEFAULT_LTI_ENDPOINT)
diff --git a/common/djangoapps/third_party_auth/tests/specs/base.py b/common/djangoapps/third_party_auth/tests/specs/base.py
index 116deacf5e1d..8f96235017da 100644
--- a/common/djangoapps/third_party_auth/tests/specs/base.py
+++ b/common/djangoapps/third_party_auth/tests/specs/base.py
@@ -481,7 +481,7 @@ def _test_login(self):
         # The AJAX on the page will log them in:
         ajax_login_response = self.client.post(
             reverse('user_api_login_session', kwargs={'api_version': 'v1'}),
-            {'email': self.user.email, 'password': 'test'}
+            {'email': self.user.email, 'password': 'Password1234'}
         )
         assert ajax_login_response.status_code == 200
         # Then the AJAX will finish the third party auth:
diff --git a/common/djangoapps/third_party_auth/tests/test_admin.py b/common/djangoapps/third_party_auth/tests/test_admin.py
index c5481a3a09b4..0acfb3492a6f 100644
--- a/common/djangoapps/third_party_auth/tests/test_admin.py
+++ b/common/djangoapps/third_party_auth/tests/test_admin.py
@@ -14,6 +14,9 @@
 from common.djangoapps.third_party_auth.tests.utils import skip_unless_thirdpartyauth
 
 
+TEST_PASSWORD = 'Password1234'
+
+
 # This is necessary because cms does not implement third party auth
 @skip_unless_thirdpartyauth()
 class Oauth2ProviderConfigAdminTest(testutil.TestCase):
@@ -36,9 +39,9 @@ def test_oauth2_provider_edit_icon_image(self):
         prepopulated correctly, and that we can clear and update the image.
         """
         # Login as a super user
-        user = UserFactory.create(is_staff=True, is_superuser=True)
+        user = UserFactory.create(is_staff=True, is_superuser=True, password=TEST_PASSWORD)
         user.save()
-        self.client.login(username=user.username, password='test')
+        self.client.login(username=user.username, password=TEST_PASSWORD)
 
         # Get baseline provider count
         providers = OAuth2ProviderConfig.objects.all()
diff --git a/common/djangoapps/util/tests/test_password_policy_validators.py b/common/djangoapps/util/tests/test_password_policy_validators.py
index f0ffe3c2b178..f5eea255bff2 100644
--- a/common/djangoapps/util/tests/test_password_policy_validators.py
+++ b/common/djangoapps/util/tests/test_password_policy_validators.py
@@ -45,6 +45,11 @@ def validation_errors_checker(self, password, msg, user=None):
                 validate_password(password, user)
             assert msg in ' '.join(cm.value.messages)
 
+    @override_settings(AUTH_PASSWORD_VALIDATORS=[
+        create_validator_config(
+            'common.djangoapps.util.password_policy_validators.MinimumLengthValidator', {'min_length': 4}
+        )
+    ])
     def test_unicode_password(self):
         """ Tests that validate_password enforces unicode """
         unicode_str = '𤭮'
@@ -55,12 +60,17 @@ def test_unicode_password(self):
         assert len(unicode_str) == 1
 
         # Test length check
-        self.validation_errors_checker(byte_str, 'This password is too short. It must contain at least 2 characters.')
-        self.validation_errors_checker(byte_str + byte_str, None)
+        self.validation_errors_checker(byte_str, 'This password is too short. It must contain at least 4 characters.')
+        self.validation_errors_checker(byte_str * 4, None)
 
         # Test badly encoded password
         self.validation_errors_checker(b'\xff\xff', 'Invalid password.')
 
+    @override_settings(AUTH_PASSWORD_VALIDATORS=[
+        create_validator_config(
+            'common.djangoapps.util.password_policy_validators.MinimumLengthValidator', {'min_length': 4}
+        )
+    ])
     def test_password_unicode_normalization(self):
         """ Tests that validate_password normalizes passwords """
         # s ̣ ̇ (s with combining dot below and combining dot above)
@@ -70,7 +80,7 @@ def test_password_unicode_normalization(self):
         # When we normalize we expect the not_normalized password to fail
         # because it should be normalized to '\u1E69' -> ṩ
         self.validation_errors_checker(not_normalized_password,
-                                       'This password is too short. It must contain at least 2 characters.')
+                                       'This password is too short. It must contain at least 4 characters.')
 
     @data(
         ([create_validator_config('common.djangoapps.util.password_policy_validators.MinimumLengthValidator', {'min_length': 2})],  # lint-amnesty, pylint: disable=line-too-long
diff --git a/common/static/common/js/karma.common.conf.js b/common/static/common/js/karma.common.conf.js
index 7b92442aaf6b..09f6a21848c3 100644
--- a/common/static/common/js/karma.common.conf.js
+++ b/common/static/common/js/karma.common.conf.js
@@ -281,15 +281,6 @@ function getBaseConfig(config, useRequireJs) {
         'framework:custom': ['factory', initFrameworks]
     };
 
-    if (process.env.hasOwnProperty('BOK_CHOY_HOSTNAME')) {
-        hostname = process.env.BOK_CHOY_HOSTNAME;
-        if (hostname === 'edx.devstack.lms') {
-            port = 19876;
-        } else {
-            port = 19877;
-        }
-    }
-
     initFrameworks.$inject = ['config.files'];
 
     return {
@@ -385,7 +376,7 @@ function getBaseConfig(config, useRequireJs) {
                 }
             }
         },
-
+        
         // Continuous Integration mode
         // if true, Karma captures browsers, runs the tests and exits
         singleRun: config.singleRun,
diff --git a/common/static/data/geoip/GeoLite2-Country.mmdb b/common/static/data/geoip/GeoLite2-Country.mmdb
index 46e3379657bb..1f3cc98bcc34 100644
Binary files a/common/static/data/geoip/GeoLite2-Country.mmdb and b/common/static/data/geoip/GeoLite2-Country.mmdb differ
diff --git a/common/test/pytest.ini b/common/test/pytest.ini
index ffbe9c134ef3..5df48c9325ee 100644
--- a/common/test/pytest.ini
+++ b/common/test/pytest.ini
@@ -11,4 +11,14 @@ filterwarnings =
     default
     ignore:No request passed to the backend, unable to rate-limit:UserWarning
     ignore::xblock.exceptions.FieldDataDeprecationWarning
+    # Remove default_app_config warning after updating Django to 4.2
+    ignore:.*You can remove default_app_config.*:PendingDeprecationWarning
+    # ABC deprecation Warning comes from libsass
+    ignore:Using or importing the ABCs from 'collections' instead of from 'collections.abc' is deprecated.*:DeprecationWarning:sass
+    # declare_namespace Warning comes from XBlock https://github.com/openedx/XBlock/issues/641
+    # and also due to dependency: https://github.com/PyFilesystem/pyfilesystem2
+    ignore:Deprecated call to `pkg_resources.declare_namespace.*:DeprecationWarning
+    ignore:.*pkg_resources is deprecated as an API.*:DeprecationWarning
+    ignore:'etree' is deprecated. Use 'xml.etree.ElementTree' instead.:DeprecationWarning:wiki
+
 norecursedirs = .cache
diff --git a/conf/locale/ar/LC_MESSAGES/django.po b/conf/locale/ar/LC_MESSAGES/django.po
index e7edd04500fc..eac51e287dff 100644
--- a/conf/locale/ar/LC_MESSAGES/django.po
+++ b/conf/locale/ar/LC_MESSAGES/django.po
@@ -3799,12 +3799,12 @@ msgid "Good"
 msgstr "جيّد"
 
 #. Translators: Replier commented on "your" response to your post
-#: lms/djangoapps/discussion/rest_api/utils.py
+#: lms/djangoapps/discussion/rest_api/discussions_notifications.py
 msgid "your"
 msgstr ""
 
 #. Translators: Replier commented on "their" response to your post
-#: lms/djangoapps/discussion/rest_api/utils.py
+#: lms/djangoapps/discussion/rest_api/discussions_notifications.py
 msgid "their"
 msgstr ""
 
@@ -7645,6 +7645,20 @@ msgid ""
 "<{strong}>{post_title}</{strong}></{p}>"
 msgstr ""
 
+#: openedx/core/djangoapps/notifications/base_notification.py
+#, python-brace-format
+msgid ""
+"<{p}><{strong}>{replier_name}</{strong}> responded to a post you’re "
+"following: <{strong}>{post_title}</{strong}></{p}>"
+msgstr ""
+
+#: openedx/core/djangoapps/notifications/base_notification.py
+#, python-brace-format
+msgid ""
+"<{p}><{strong}>{replier_name}</{strong}> commented on {author_name}'s "
+"response in a post you’re following <{strong}>{post_title}</{strong}></{p}>"
+msgstr ""
+
 #: openedx/core/djangoapps/notifications/base_notification.py
 msgid ""
 "Notifications for responses and comments on your posts, and the ones you’re "
diff --git a/conf/locale/ar/LC_MESSAGES/djangojs.po b/conf/locale/ar/LC_MESSAGES/djangojs.po
index 09d3be4a9554..4c3922ce7e3b 100644
--- a/conf/locale/ar/LC_MESSAGES/djangojs.po
+++ b/conf/locale/ar/LC_MESSAGES/djangojs.po
@@ -194,7 +194,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: edx-platform\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2023-09-17 20:42+0000\n"
+"POT-Creation-Date: 2023-10-08 20:42+0000\n"
 "PO-Revision-Date: 2014-06-11 15:18+0000\n"
 "Last-Translator: Abderraouf Mehdi Bouhali <armbouhali@gmail.com>, 2022\n"
 "Language-Team: Arabic (http://app.transifex.com/open-edx/edx-platform/language/ar/)\n"
diff --git a/conf/locale/ca/LC_MESSAGES/django.po b/conf/locale/ca/LC_MESSAGES/django.po
index adf7ef616a7f..409ce7fb7447 100644
--- a/conf/locale/ca/LC_MESSAGES/django.po
+++ b/conf/locale/ca/LC_MESSAGES/django.po
@@ -67,7 +67,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.1a\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2023-09-17 20:43+0000\n"
+"POT-Creation-Date: 2023-10-08 20:43+0000\n"
 "PO-Revision-Date: 2019-01-20 20:43+0000\n"
 "Last-Translator: Waheed Ahmed <waheed@edx.org>, 2019\n"
 "Language-Team: Catalan (https://app.transifex.com/open-edx/teams/6205/ca/)\n"
@@ -3250,12 +3250,12 @@ msgid "Good"
 msgstr ""
 
 #. Translators: Replier commented on "your" response to your post
-#: lms/djangoapps/discussion/rest_api/utils.py
+#: lms/djangoapps/discussion/rest_api/discussions_notifications.py
 msgid "your"
 msgstr ""
 
 #. Translators: Replier commented on "their" response to your post
-#: lms/djangoapps/discussion/rest_api/utils.py
+#: lms/djangoapps/discussion/rest_api/discussions_notifications.py
 msgid "their"
 msgstr ""
 
@@ -6847,6 +6847,20 @@ msgid ""
 "<{strong}>{post_title}</{strong}></{p}>"
 msgstr ""
 
+#: openedx/core/djangoapps/notifications/base_notification.py
+#, python-brace-format
+msgid ""
+"<{p}><{strong}>{replier_name}</{strong}> responded to a post you’re "
+"following: <{strong}>{post_title}</{strong}></{p}>"
+msgstr ""
+
+#: openedx/core/djangoapps/notifications/base_notification.py
+#, python-brace-format
+msgid ""
+"<{p}><{strong}>{replier_name}</{strong}> commented on {author_name}'s "
+"response in a post you’re following <{strong}>{post_title}</{strong}></{p}>"
+msgstr ""
+
 #: openedx/core/djangoapps/notifications/base_notification.py
 msgid ""
 "Notifications for responses and comments on your posts, and the ones you’re "
diff --git a/conf/locale/ca/LC_MESSAGES/djangojs.po b/conf/locale/ca/LC_MESSAGES/djangojs.po
index 9e6413627be9..5e9a5cd77493 100644
--- a/conf/locale/ca/LC_MESSAGES/djangojs.po
+++ b/conf/locale/ca/LC_MESSAGES/djangojs.po
@@ -48,7 +48,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: edx-platform\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2023-09-17 20:42+0000\n"
+"POT-Creation-Date: 2023-10-08 20:42+0000\n"
 "PO-Revision-Date: 2014-06-11 15:18+0000\n"
 "Last-Translator: Waheed Ahmed <waheed@edx.org>, 2019\n"
 "Language-Team: Catalan (http://app.transifex.com/open-edx/edx-platform/language/ca/)\n"
diff --git a/conf/locale/de_DE/LC_MESSAGES/django.po b/conf/locale/de_DE/LC_MESSAGES/django.po
index 9739f3ec4207..f7bc07af7bcc 100644
--- a/conf/locale/de_DE/LC_MESSAGES/django.po
+++ b/conf/locale/de_DE/LC_MESSAGES/django.po
@@ -3691,12 +3691,12 @@ msgid "Good"
 msgstr "Gut"
 
 #. Translators: Replier commented on "your" response to your post
-#: lms/djangoapps/discussion/rest_api/utils.py
+#: lms/djangoapps/discussion/rest_api/discussions_notifications.py
 msgid "your"
 msgstr ""
 
 #. Translators: Replier commented on "their" response to your post
-#: lms/djangoapps/discussion/rest_api/utils.py
+#: lms/djangoapps/discussion/rest_api/discussions_notifications.py
 msgid "their"
 msgstr ""
 
@@ -7607,6 +7607,20 @@ msgid ""
 "<{strong}>{post_title}</{strong}></{p}>"
 msgstr ""
 
+#: openedx/core/djangoapps/notifications/base_notification.py
+#, python-brace-format
+msgid ""
+"<{p}><{strong}>{replier_name}</{strong}> responded to a post you’re "
+"following: <{strong}>{post_title}</{strong}></{p}>"
+msgstr ""
+
+#: openedx/core/djangoapps/notifications/base_notification.py
+#, python-brace-format
+msgid ""
+"<{p}><{strong}>{replier_name}</{strong}> commented on {author_name}'s "
+"response in a post you’re following <{strong}>{post_title}</{strong}></{p}>"
+msgstr ""
+
 #: openedx/core/djangoapps/notifications/base_notification.py
 msgid ""
 "Notifications for responses and comments on your posts, and the ones you’re "
diff --git a/conf/locale/de_DE/LC_MESSAGES/djangojs.po b/conf/locale/de_DE/LC_MESSAGES/djangojs.po
index 8dc44711bbbf..27dc186b42ea 100644
--- a/conf/locale/de_DE/LC_MESSAGES/djangojs.po
+++ b/conf/locale/de_DE/LC_MESSAGES/djangojs.po
@@ -134,7 +134,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: edx-platform\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2023-09-17 20:42+0000\n"
+"POT-Creation-Date: 2023-10-08 20:42+0000\n"
 "PO-Revision-Date: 2014-06-11 15:18+0000\n"
 "Last-Translator: Alfredo Guillem, 2022\n"
 "Language-Team: German (Germany) (http://app.transifex.com/open-edx/edx-platform/language/de_DE/)\n"
diff --git a/conf/locale/el/LC_MESSAGES/django.po b/conf/locale/el/LC_MESSAGES/django.po
index 9c2da911a2f5..956aeba85e85 100644
--- a/conf/locale/el/LC_MESSAGES/django.po
+++ b/conf/locale/el/LC_MESSAGES/django.po
@@ -98,7 +98,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.1a\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2023-09-17 20:43+0000\n"
+"POT-Creation-Date: 2023-10-08 20:43+0000\n"
 "PO-Revision-Date: 2019-01-20 20:43+0000\n"
 "Last-Translator: Waheed Ahmed <waheed@edx.org>, 2019\n"
 "Language-Team: Greek (https://app.transifex.com/open-edx/teams/6205/el/)\n"
@@ -3376,12 +3376,12 @@ msgid "Good"
 msgstr ""
 
 #. Translators: Replier commented on "your" response to your post
-#: lms/djangoapps/discussion/rest_api/utils.py
+#: lms/djangoapps/discussion/rest_api/discussions_notifications.py
 msgid "your"
 msgstr ""
 
 #. Translators: Replier commented on "their" response to your post
-#: lms/djangoapps/discussion/rest_api/utils.py
+#: lms/djangoapps/discussion/rest_api/discussions_notifications.py
 msgid "their"
 msgstr ""
 
@@ -6994,6 +6994,20 @@ msgid ""
 "<{strong}>{post_title}</{strong}></{p}>"
 msgstr ""
 
+#: openedx/core/djangoapps/notifications/base_notification.py
+#, python-brace-format
+msgid ""
+"<{p}><{strong}>{replier_name}</{strong}> responded to a post you’re "
+"following: <{strong}>{post_title}</{strong}></{p}>"
+msgstr ""
+
+#: openedx/core/djangoapps/notifications/base_notification.py
+#, python-brace-format
+msgid ""
+"<{p}><{strong}>{replier_name}</{strong}> commented on {author_name}'s "
+"response in a post you’re following <{strong}>{post_title}</{strong}></{p}>"
+msgstr ""
+
 #: openedx/core/djangoapps/notifications/base_notification.py
 msgid ""
 "Notifications for responses and comments on your posts, and the ones you’re "
diff --git a/conf/locale/el/LC_MESSAGES/djangojs.po b/conf/locale/el/LC_MESSAGES/djangojs.po
index 19025b0dd51b..2355c9b335c3 100644
--- a/conf/locale/el/LC_MESSAGES/djangojs.po
+++ b/conf/locale/el/LC_MESSAGES/djangojs.po
@@ -87,7 +87,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: edx-platform\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2023-09-17 20:42+0000\n"
+"POT-Creation-Date: 2023-10-08 20:42+0000\n"
 "PO-Revision-Date: 2014-06-11 15:18+0000\n"
 "Last-Translator: Angelos Chraniotis, 2023\n"
 "Language-Team: Greek (http://app.transifex.com/open-edx/edx-platform/language/el/)\n"
diff --git a/conf/locale/en/LC_MESSAGES/django.po b/conf/locale/en/LC_MESSAGES/django.po
index fc72790f43ce..4c4bfdcc5eda 100644
--- a/conf/locale/en/LC_MESSAGES/django.po
+++ b/conf/locale/en/LC_MESSAGES/django.po
@@ -38,8 +38,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.1a\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2023-10-08 20:36+0000\n"
-"PO-Revision-Date: 2023-10-08 20:36:26.861016\n"
+"POT-Creation-Date: 2023-10-22 20:35+0000\n"
+"PO-Revision-Date: 2023-10-22 20:35:52.246505\n"
 "Last-Translator: \n"
 "Language-Team: openedx-translation <openedx-translation@googlegroups.com>\n"
 "Language: en\n"
@@ -1827,53 +1827,6 @@ msgstr ""
 msgid "This value must be all lowercase."
 msgstr ""
 
-#: lms/djangoapps/badges/models.py
-msgid "The course mode for this badge image. For example, \"verified\" or \"honor\"."
-msgstr ""
-
-#: lms/djangoapps/badges/models.py
-msgid ""
-"Badge images must be square PNG files. The file size should be under 250KB."
-msgstr ""
-
-#: lms/djangoapps/badges/models.py
-msgid ""
-"Set this value to True if you want this image to be the default image for "
-"any course modes that do not have a specified badge image. You can have only"
-" one default image."
-msgstr ""
-
-#: lms/djangoapps/badges/models.py
-msgid "There can be only one default image."
-msgstr ""
-
-#: lms/djangoapps/badges/models.py
-msgid ""
-"On each line, put the number of completed courses to award a badge for, a "
-"comma, and the slug of a badge class you have created that has the issuing "
-"component 'openedx__course'. For example: 3,enrolled_3_courses"
-msgstr ""
-
-#: lms/djangoapps/badges/models.py
-msgid ""
-"On each line, put the number of enrolled courses to award a badge for, a "
-"comma, and the slug of a badge class you have created that has the issuing "
-"component 'openedx__course'. For example: 3,enrolled_3_courses"
-msgstr ""
-
-#: lms/djangoapps/badges/models.py
-msgid ""
-"Each line is a comma-separated list. The first item in each line is the slug"
-" of a badge class you have created that has an issuing component of "
-"'openedx__course'. The remaining items in each line are the course keys the "
-"learner needs to complete to be awarded the badge. For example: "
-"slug_for_compsci_courses_group_badge,course-v1:CompSci+Course+First,course-v1:CompsSci+Course+Second"
-msgstr ""
-
-#: lms/djangoapps/badges/models.py
-msgid "Please check the syntax of your entry."
-msgstr ""
-
 #. Translators: This string is used across Open edX installations
 #. as a callback to edX. Please do not translate `edX.org`
 #: lms/djangoapps/branding/api.py
@@ -3235,12 +3188,12 @@ msgid "Good"
 msgstr ""
 
 #. Translators: Replier commented on "your" response to your post
-#: lms/djangoapps/discussion/rest_api/utils.py
+#: lms/djangoapps/discussion/rest_api/discussions_notifications.py
 msgid "your"
 msgstr ""
 
 #. Translators: Replier commented on "their" response to your post
-#: lms/djangoapps/discussion/rest_api/utils.py
+#: lms/djangoapps/discussion/rest_api/discussions_notifications.py
 msgid "their"
 msgstr ""
 
@@ -6853,6 +6806,20 @@ msgid ""
 "<{strong}>{post_title}</{strong}></{p}>"
 msgstr ""
 
+#: openedx/core/djangoapps/notifications/base_notification.py
+#, python-brace-format
+msgid ""
+"<{p}><{strong}>{replier_name}</{strong}> responded to a post you’re "
+"following: <{strong}>{post_title}</{strong}></{p}>"
+msgstr ""
+
+#: openedx/core/djangoapps/notifications/base_notification.py
+#, python-brace-format
+msgid ""
+"<{p}><{strong}>{replier_name}</{strong}> commented on {author_name}'s "
+"response in a post you’re following <{strong}>{post_title}</{strong}></{p}>"
+msgstr ""
+
 #: openedx/core/djangoapps/notifications/base_notification.py
 msgid ""
 "Notifications for responses and comments on your posts, and the ones you’re "
@@ -9737,16 +9704,6 @@ msgid ""
 "thumbnail image on the Settings & Details page."
 msgstr ""
 
-#: xmodule/course_block.py
-msgid "Issue Open Badges"
-msgstr ""
-
-#: xmodule/course_block.py
-msgid ""
-"Issue Open Badges badges for this course. Badges are generated when "
-"certificates are created."
-msgstr ""
-
 #: xmodule/course_block.py
 msgid ""
 "Use this setting only when generating PDF certificates. Between quotation "
@@ -18758,7 +18715,7 @@ msgid "Studio Accessibility Policy"
 msgstr ""
 
 #: cms/templates/asset_index.html cms/templates/widgets/header.html
-msgid "Files & Uploads"
+msgid "Files"
 msgstr ""
 
 #: cms/templates/certificates.html
@@ -20410,6 +20367,10 @@ msgstr ""
 msgid "Libraries"
 msgstr ""
 
+#: cms/templates/index.html
+msgid "Taxonomies"
+msgstr ""
+
 #: cms/templates/index.html
 msgid "Are you staff on an existing {studio_name} course?"
 msgstr ""
diff --git a/conf/locale/en/LC_MESSAGES/djangojs.po b/conf/locale/en/LC_MESSAGES/djangojs.po
index 0dec53e989b4..c200d37c4721 100644
--- a/conf/locale/en/LC_MESSAGES/djangojs.po
+++ b/conf/locale/en/LC_MESSAGES/djangojs.po
@@ -32,8 +32,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.1a\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2023-10-08 20:36+0000\n"
-"PO-Revision-Date: 2023-10-08 20:36:26.755103\n"
+"POT-Creation-Date: 2023-10-22 20:35+0000\n"
+"PO-Revision-Date: 2023-10-22 20:35:52.488124\n"
 "Last-Translator: \n"
 "Language-Team: openedx-translation <openedx-translation@googlegroups.com>\n"
 "Language: en\n"
@@ -132,7 +132,6 @@ msgstr ""
 #: cms/templates/js/course-video-settings.underscore
 #: common/static/common/templates/discussion/templates.underscore
 #: common/static/common/templates/image-modal.underscore
-#: openedx/features/learner_profile/static/learner_profile/templates/share_modal.underscore
 msgid "Close"
 msgstr ""
 
@@ -3679,10 +3678,6 @@ msgid ""
 "interests are, why you're taking courses, or what you hope to learn."
 msgstr ""
 
-#: openedx/features/learner_profile/static/learner_profile/js/views/badge_list_container.js
-msgid "Accomplishments Pagination"
-msgstr ""
-
 #: openedx/features/learner_profile/static/learner_profile/js/views/learner_profile_fields.js
 msgid "Account Settings page."
 msgstr ""
@@ -3711,10 +3706,6 @@ msgstr ""
 msgid "About Me"
 msgstr ""
 
-#: openedx/features/learner_profile/static/learner_profile/js/views/learner_profile_view.js
-msgid "Accomplishments"
-msgstr ""
-
 #: openedx/features/learner_profile/static/learner_profile/js/views/learner_profile_view.js
 msgid "Profile"
 msgstr ""
@@ -9201,32 +9192,6 @@ msgstr[1] ""
 msgid "Sorry, no results were found."
 msgstr ""
 
-#: openedx/features/learner_profile/static/learner_profile/templates/badge.underscore
-#, python-format
-msgid "Share your \"%(display_name)s\" award"
-msgstr ""
-
-#: openedx/features/learner_profile/static/learner_profile/templates/badge.underscore
-msgid "Share"
-msgstr ""
-
-#: openedx/features/learner_profile/static/learner_profile/templates/badge.underscore
-#, python-format
-msgid "Earned %(created)s."
-msgstr ""
-
-#: openedx/features/learner_profile/static/learner_profile/templates/badge_placeholder.underscore
-msgid "What's Your Next Accomplishment?"
-msgstr ""
-
-#: openedx/features/learner_profile/static/learner_profile/templates/badge_placeholder.underscore
-msgid "Start working toward your next learning goal."
-msgstr ""
-
-#: openedx/features/learner_profile/static/learner_profile/templates/badge_placeholder.underscore
-msgid "Find a course"
-msgstr ""
-
 #: openedx/features/learner_profile/static/learner_profile/templates/section_two.underscore
 msgid "You are currently sharing a limited profile."
 msgstr ""
@@ -9235,30 +9200,6 @@ msgstr ""
 msgid "This learner is currently sharing a limited profile."
 msgstr ""
 
-#: openedx/features/learner_profile/static/learner_profile/templates/share_modal.underscore
-msgid "Share on Mozilla Backpack"
-msgstr ""
-
-#: openedx/features/learner_profile/static/learner_profile/templates/share_modal.underscore
-msgid ""
-"To share your certificate on Mozilla Backpack, you must first have a "
-"Backpack account. Complete the following steps to add your certificate to "
-"Backpack."
-msgstr ""
-
-#: openedx/features/learner_profile/static/learner_profile/templates/share_modal.underscore
-msgid ""
-"Create a {link_start}Mozilla Backpack{link_end} account, or log in to your "
-"existing account"
-msgstr ""
-
-#: openedx/features/learner_profile/static/learner_profile/templates/share_modal.underscore
-msgid ""
-"{download_link_start}Download this image (right-click or option-click, save "
-"as){link_end} and then {upload_link_start}upload{link_end} it to your "
-"backpack."
-msgstr ""
-
 #: cms/templates/js/access-editor.underscore
 msgid "Limit Access"
 msgstr ""
diff --git a/conf/locale/eo/LC_MESSAGES/django.mo b/conf/locale/eo/LC_MESSAGES/django.mo
index 6a1ae31477f4..b521617652b4 100644
Binary files a/conf/locale/eo/LC_MESSAGES/django.mo and b/conf/locale/eo/LC_MESSAGES/django.mo differ
diff --git a/conf/locale/eo/LC_MESSAGES/django.po b/conf/locale/eo/LC_MESSAGES/django.po
index 626bd259fd97..cc8726ae8d17 100644
--- a/conf/locale/eo/LC_MESSAGES/django.po
+++ b/conf/locale/eo/LC_MESSAGES/django.po
@@ -38,8 +38,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.1a\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2023-10-08 20:36+0000\n"
-"PO-Revision-Date: 2023-10-08 20:36:26.861016\n"
+"POT-Creation-Date: 2023-10-22 20:35+0000\n"
+"PO-Revision-Date: 2023-10-22 20:35:52.246505\n"
 "Last-Translator: \n"
 "Language-Team: openedx-translation <openedx-translation@googlegroups.com>\n"
 "Language: eo\n"
@@ -2320,90 +2320,6 @@ msgid "This value must be all lowercase."
 msgstr ""
 "Thïs välüé müst ßé äll löwérçäsé. Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αмєт, ¢σηѕє¢тє#"
 
-#: lms/djangoapps/badges/models.py
-msgid "The course mode for this badge image. For example, \"verified\" or \"honor\"."
-msgstr ""
-"Thé çöürsé mödé för thïs ßädgé ïmägé. För éxämplé, \"vérïfïéd\" ör "
-"\"hönör\". Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αмєт, ¢σηѕє¢тєтυя#"
-
-#: lms/djangoapps/badges/models.py
-msgid ""
-"Badge images must be square PNG files. The file size should be under 250KB."
-msgstr ""
-"Bädgé ïmägés müst ßé sqüäré PNG fïlés. Thé fïlé sïzé shöüld ßé ündér 250KB. "
-"Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αмєт, ¢σηѕє¢тєтυ#"
-
-#: lms/djangoapps/badges/models.py
-msgid ""
-"Set this value to True if you want this image to be the default image for "
-"any course modes that do not have a specified badge image. You can have only"
-" one default image."
-msgstr ""
-"Sét thïs välüé tö Trüé ïf ýöü wänt thïs ïmägé tö ßé thé défäült ïmägé för "
-"äný çöürsé mödés thät dö nöt hävé ä spéçïfïéd ßädgé ïmägé. Ýöü çän hävé önlý"
-" öné défäült ïmägé. Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αмєт, ¢σηѕє¢тєтυя α∂ιριѕι¢ιηg "
-"єłιт, ѕє∂ ∂σ єιυѕмσ∂ тємρσя ιη¢ι∂ι∂υηт υт łαвσяє єт ∂σłσяє мαgηα αłιqυα. υт "
-"єηιм α∂ мιηιм νєηιαм, qυιѕ ησѕтяυ∂ єχєя¢ιтαтιση υłłαм¢σ łαвσяιѕ ηιѕι υт "
-"αłιqυιρ єχ єα ¢σммσ∂σ ¢σηѕєqυαт. ∂υιѕ αυтє ιяυяє ∂σłσя ιη яєρяєнєη∂єяιт ιη "
-"νσłυρтαтє νєłιт єѕѕє ¢ιłłυм ∂σłσяє єυ ƒυgιαт ηυłłα ραяιαтυя. єχ¢єρтєυя ѕιηт "
-"σ¢¢αє¢αт ¢υρι∂αтαт ηση ρяσι∂єηт, ѕυηт ιη ¢υłρα qυι σƒ#"
-
-#: lms/djangoapps/badges/models.py
-msgid "There can be only one default image."
-msgstr ""
-"Théré çän ßé önlý öné défäült ïmägé. Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αмєт, "
-"¢σηѕє¢тєтυ#"
-
-#: lms/djangoapps/badges/models.py
-msgid ""
-"On each line, put the number of completed courses to award a badge for, a "
-"comma, and the slug of a badge class you have created that has the issuing "
-"component 'openedx__course'. For example: 3,enrolled_3_courses"
-msgstr ""
-"Ön éäçh lïné, püt thé nümßér öf çömplétéd çöürsés tö äwärd ä ßädgé för, ä "
-"çömmä, änd thé slüg öf ä ßädgé çläss ýöü hävé çréätéd thät häs thé ïssüïng "
-"çömpönént 'öpénédx__çöürsé'. För éxämplé: 3,énrölléd_3_çöürsés Ⱡ'σяєм ιρѕυм "
-"∂σłσя ѕιт αмєт, ¢σηѕє¢тєтυя α∂ιριѕι¢ιηg єłιт, ѕє∂ ∂σ єιυѕмσ∂ тємρσя "
-"ιη¢ι∂ι∂υηт υт łαвσяє єт ∂σłσяє мαgηα αłιqυα. υт єηιм α∂ мιηιм νєηιαм, qυιѕ "
-"ησѕтяυ∂ єχєя¢ιтαтιση υłłαм¢σ łαвσяιѕ ηιѕι υт αłιqυιρ єχ єα ¢σммσ∂σ "
-"¢σηѕєqυαт. ∂υιѕ αυтє ιяυяє ∂σłσя ιη яєρяєнєη∂єяιт ιη νσłυρтαтє νєłιт єѕѕє "
-"¢ιłłυм ∂σłσяє єυ ƒυgιαт ηυłłα ραяιαтυя. єχ¢єρт#"
-
-#: lms/djangoapps/badges/models.py
-msgid ""
-"On each line, put the number of enrolled courses to award a badge for, a "
-"comma, and the slug of a badge class you have created that has the issuing "
-"component 'openedx__course'. For example: 3,enrolled_3_courses"
-msgstr ""
-"Ön éäçh lïné, püt thé nümßér öf énrölléd çöürsés tö äwärd ä ßädgé för, ä "
-"çömmä, änd thé slüg öf ä ßädgé çläss ýöü hävé çréätéd thät häs thé ïssüïng "
-"çömpönént 'öpénédx__çöürsé'. För éxämplé: 3,énrölléd_3_çöürsés Ⱡ'σяєм ιρѕυм "
-"∂σłσя ѕιт αмєт, ¢σηѕє¢тєтυя α∂ιριѕι¢ιηg єłιт, ѕє∂ ∂σ єιυѕмσ∂ тємρσя "
-"ιη¢ι∂ι∂υηт υт łαвσяє єт ∂σłσяє мαgηα αłιqυα. υт єηιм α∂ мιηιм νєηιαм, qυιѕ "
-"ησѕтяυ∂ єχєя¢ιтαтιση υłłαм¢σ łαвσяιѕ ηιѕι υт αłιqυιρ єχ єα ¢σммσ∂σ "
-"¢σηѕєqυαт. ∂υιѕ αυтє ιяυяє ∂σłσя ιη яєρяєнєη∂єяιт ιη νσłυρтαтє νєłιт єѕѕє "
-"¢ιłłυм ∂σłσяє єυ ƒυgιαт ηυłłα ραяιαтυя. єχ¢єρтє#"
-
-#: lms/djangoapps/badges/models.py
-msgid ""
-"Each line is a comma-separated list. The first item in each line is the slug"
-" of a badge class you have created that has an issuing component of "
-"'openedx__course'. The remaining items in each line are the course keys the "
-"learner needs to complete to be awarded the badge. For example: "
-"slug_for_compsci_courses_group_badge,course-v1:CompSci+Course+First,course-v1:CompsSci+Course+Second"
-msgstr ""
-"Éäçh lïné ïs ä çömmä-sépärätéd lïst. Thé fïrst ïtém ïn éäçh lïné ïs thé slüg"
-" öf ä ßädgé çläss ýöü hävé çréätéd thät häs än ïssüïng çömpönént öf "
-"'öpénédx__çöürsé'. Thé rémäïnïng ïtéms ïn éäçh lïné äré thé çöürsé kéýs thé "
-"léärnér nééds tö çömplété tö ßé äwärdéd thé ßädgé. För éxämplé: "
-"slüg_för_çömpsçï_çöürsés_gröüp_ßädgé,çöürsé-v1:ÇömpSçï+Çöürsé+Fïrst,çöürsé-v1:ÇömpsSçï+Çöürsé+Séçönd#"
-
-#: lms/djangoapps/badges/models.py
-msgid "Please check the syntax of your entry."
-msgstr ""
-"Pléäsé çhéçk thé sýntäx öf ýöür éntrý. Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αмєт, "
-"¢σηѕє¢тєтυя#"
-
 #. Translators: This string is used across Open edX installations
 #. as a callback to edX. Please do not translate `edX.org`
 #: lms/djangoapps/branding/api.py
@@ -4122,12 +4038,12 @@ msgid "Good"
 msgstr "Gööd Ⱡ'σяєм ι#"
 
 #. Translators: Replier commented on "your" response to your post
-#: lms/djangoapps/discussion/rest_api/utils.py
+#: lms/djangoapps/discussion/rest_api/discussions_notifications.py
 msgid "your"
 msgstr "ýöür Ⱡ'σяєм ι#"
 
 #. Translators: Replier commented on "their" response to your post
-#: lms/djangoapps/discussion/rest_api/utils.py
+#: lms/djangoapps/discussion/rest_api/discussions_notifications.py
 msgid "their"
 msgstr "théïr Ⱡ'σяєм ιρѕ#"
 
@@ -8713,6 +8629,26 @@ msgstr ""
 "<{strong}>{post_title}</{strong}></{p}> Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αмєт, "
 "¢σηѕє¢т#"
 
+#: openedx/core/djangoapps/notifications/base_notification.py
+#, python-brace-format
+msgid ""
+"<{p}><{strong}>{replier_name}</{strong}> responded to a post you’re "
+"following: <{strong}>{post_title}</{strong}></{p}>"
+msgstr ""
+"<{p}><{strong}>{replier_name}</{strong}> réspöndéd tö ä pöst ýöü’ré "
+"föllöwïng: <{strong}>{post_title}</{strong}></{p}> Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт "
+"αмєт, ¢σηѕє¢тєтυя α#"
+
+#: openedx/core/djangoapps/notifications/base_notification.py
+#, python-brace-format
+msgid ""
+"<{p}><{strong}>{replier_name}</{strong}> commented on {author_name}'s "
+"response in a post you’re following <{strong}>{post_title}</{strong}></{p}>"
+msgstr ""
+"<{p}><{strong}>{replier_name}</{strong}> çömméntéd ön {author_name}'s "
+"réspönsé ïn ä pöst ýöü’ré föllöwïng <{strong}>{post_title}</{strong}></{p}> "
+"Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αмєт, ¢σηѕє¢тє#"
+
 #: openedx/core/djangoapps/notifications/base_notification.py
 msgid ""
 "Notifications for responses and comments on your posts, and the ones you’re "
@@ -12444,18 +12380,6 @@ msgstr ""
 "Édït thé nämé öf thé vïdéö thümßnäïl ïmägé fïlé. Ýöü çän sét thé vïdéö "
 "thümßnäïl ïmägé ön thé Séttïngs & Détäïls pägé. Ⱡ'σяєм ιρѕυм #"
 
-#: xmodule/course_block.py
-msgid "Issue Open Badges"
-msgstr "Ìssüé Öpén Bädgés Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αмє#"
-
-#: xmodule/course_block.py
-msgid ""
-"Issue Open Badges badges for this course. Badges are generated when "
-"certificates are created."
-msgstr ""
-"Ìssüé Öpén Bädgés ßädgés för thïs çöürsé. Bädgés äré générätéd whén "
-"çértïfïçätés äré çréätéd. Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αмєт, ¢σ#"
-
 #: xmodule/course_block.py
 msgid ""
 "Use this setting only when generating PDF certificates. Between quotation "
@@ -24182,8 +24106,8 @@ msgid "Studio Accessibility Policy"
 msgstr "Stüdïö Àççéssïßïlïtý Pölïçý Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αмєт, ¢σηѕє#"
 
 #: cms/templates/asset_index.html cms/templates/widgets/header.html
-msgid "Files & Uploads"
-msgstr "Fïlés & Ûplöäds Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт α#"
+msgid "Files"
+msgstr "Fïlés Ⱡ'σяєм ιρѕ#"
 
 #: cms/templates/certificates.html
 msgid "Course Certificates"
@@ -26496,6 +26420,10 @@ msgstr "Àrçhïvéd Çöürsés Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αм
 msgid "Libraries"
 msgstr "Lïßrärïés Ⱡ'σяєм ιρѕυм ∂σł#"
 
+#: cms/templates/index.html
+msgid "Taxonomies"
+msgstr "Täxönömïés Ⱡ'σяєм ιρѕυм ∂σłσ#"
+
 #: cms/templates/index.html
 msgid "Are you staff on an existing {studio_name} course?"
 msgstr ""
diff --git a/conf/locale/eo/LC_MESSAGES/djangojs.mo b/conf/locale/eo/LC_MESSAGES/djangojs.mo
index 07f0b257fb8d..04a57cb98c72 100644
Binary files a/conf/locale/eo/LC_MESSAGES/djangojs.mo and b/conf/locale/eo/LC_MESSAGES/djangojs.mo differ
diff --git a/conf/locale/eo/LC_MESSAGES/djangojs.po b/conf/locale/eo/LC_MESSAGES/djangojs.po
index fef2609d9f4c..b5201799f4cd 100644
--- a/conf/locale/eo/LC_MESSAGES/djangojs.po
+++ b/conf/locale/eo/LC_MESSAGES/djangojs.po
@@ -32,8 +32,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.1a\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2023-10-08 20:36+0000\n"
-"PO-Revision-Date: 2023-10-08 20:36:26.755103\n"
+"POT-Creation-Date: 2023-10-22 20:35+0000\n"
+"PO-Revision-Date: 2023-10-22 20:35:52.488124\n"
 "Last-Translator: \n"
 "Language-Team: openedx-translation <openedx-translation@googlegroups.com>\n"
 "Language: eo\n"
@@ -132,7 +132,6 @@ msgstr "Ûplöädïng Ⱡ'σяєм ιρѕυм ∂σł#"
 #: cms/templates/js/course-video-settings.underscore
 #: common/static/common/templates/discussion/templates.underscore
 #: common/static/common/templates/image-modal.underscore
-#: openedx/features/learner_profile/static/learner_profile/templates/share_modal.underscore
 msgid "Close"
 msgstr "Çlösé Ⱡ'σяєм ιρѕ#"
 
@@ -4634,10 +4633,6 @@ msgstr ""
 "¢ιłłυм ∂σłσяє єυ ƒυgιαт ηυłłα ραяιαтυя. єχ¢єρтєυя ѕιηт σ¢¢αє¢αт ¢υρι∂αтαт "
 "ηση ρяσι∂єηт, ѕυηт ιη ¢υłρα qυι σƒƒι¢ια ∂єѕєяυηт мσłłιт αηιм ι∂ єѕт łα#"
 
-#: openedx/features/learner_profile/static/learner_profile/js/views/badge_list_container.js
-msgid "Accomplishments Pagination"
-msgstr "Àççömplïshménts Pägïnätïön Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αмєт, ¢σηѕ#"
-
 #: openedx/features/learner_profile/static/learner_profile/js/views/learner_profile_fields.js
 msgid "Account Settings page."
 msgstr "Àççöünt Séttïngs pägé. Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αмєт, ¢#"
@@ -4672,10 +4667,6 @@ msgstr "Pröfïlé ïmägé för {username} Ⱡ'σяєм ιρѕυм ∂σłσя
 msgid "About Me"
 msgstr "Àßöüt Mé Ⱡ'σяєм ιρѕυм ∂#"
 
-#: openedx/features/learner_profile/static/learner_profile/js/views/learner_profile_view.js
-msgid "Accomplishments"
-msgstr "Àççömplïshménts Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт α#"
-
 #: openedx/features/learner_profile/static/learner_profile/js/views/learner_profile_view.js
 msgid "Profile"
 msgstr "Pröfïlé Ⱡ'σяєм ιρѕυм #"
@@ -11066,35 +11057,6 @@ msgstr[1] "Löäd néxt {num_items} résülts Ⱡ'σяєм ιρѕυм ∂σłσ
 msgid "Sorry, no results were found."
 msgstr "Sörrý, nö résülts wéré föünd. Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αмєт, ¢σηѕє¢#"
 
-#: openedx/features/learner_profile/static/learner_profile/templates/badge.underscore
-#, python-format
-msgid "Share your \"%(display_name)s\" award"
-msgstr "Shäré ýöür \"%(display_name)s\" äwärd Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αмєт, ¢#"
-
-#: openedx/features/learner_profile/static/learner_profile/templates/badge.underscore
-msgid "Share"
-msgstr "Shäré Ⱡ'σяєм ιρѕ#"
-
-#: openedx/features/learner_profile/static/learner_profile/templates/badge.underscore
-#, python-format
-msgid "Earned %(created)s."
-msgstr "Éärnéd %(created)s. Ⱡ'σяєм ιρѕυм ∂σłσя #"
-
-#: openedx/features/learner_profile/static/learner_profile/templates/badge_placeholder.underscore
-msgid "What's Your Next Accomplishment?"
-msgstr ""
-"Whät's Ýöür Néxt Àççömplïshmént? Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αмєт, ¢σηѕє¢тє#"
-
-#: openedx/features/learner_profile/static/learner_profile/templates/badge_placeholder.underscore
-msgid "Start working toward your next learning goal."
-msgstr ""
-"Stärt wörkïng töwärd ýöür néxt léärnïng göäl. Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αмєт, "
-"¢σηѕє¢тєтυя #"
-
-#: openedx/features/learner_profile/static/learner_profile/templates/badge_placeholder.underscore
-msgid "Find a course"
-msgstr "Fïnd ä çöürsé Ⱡ'σяєм ιρѕυм ∂σłσя ѕι#"
-
 #: openedx/features/learner_profile/static/learner_profile/templates/section_two.underscore
 msgid "You are currently sharing a limited profile."
 msgstr ""
@@ -11107,43 +11069,6 @@ msgstr ""
 "Thïs léärnér ïs çürréntlý shärïng ä lïmïtéd pröfïlé. Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт "
 "αмєт, ¢σηѕє¢тєтυя α#"
 
-#: openedx/features/learner_profile/static/learner_profile/templates/share_modal.underscore
-msgid "Share on Mozilla Backpack"
-msgstr "Shäré ön Mözïllä Bäçkpäçk Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αмєт, ¢σηѕ#"
-
-#: openedx/features/learner_profile/static/learner_profile/templates/share_modal.underscore
-msgid ""
-"To share your certificate on Mozilla Backpack, you must first have a "
-"Backpack account. Complete the following steps to add your certificate to "
-"Backpack."
-msgstr ""
-"Tö shäré ýöür çértïfïçäté ön Mözïllä Bäçkpäçk, ýöü müst fïrst hävé ä "
-"Bäçkpäçk äççöünt. Çömplété thé föllöwïng stéps tö ädd ýöür çértïfïçäté tö "
-"Bäçkpäçk. Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αмєт, ¢σηѕє¢тєтυя α∂ιριѕι¢ιηg єłιт, ѕє∂ ∂σ "
-"єιυѕмσ∂ тємρσя ιη¢ι∂ι∂υηт υт łαвσяє єт ∂σłσяє мαgηα αłιqυα. υт єηιм α∂ мιηιм"
-" νєηιαм, qυιѕ ησѕтяυ∂ єχєя¢ιтαтιση υłłαм¢σ łαвσяιѕ ηιѕι υт αłιqυιρ єχ єα "
-"¢σммσ∂σ ¢σηѕєqυαт. ∂υιѕ αυтє ιяυяє ∂σłσя ιη яєρяєнєη∂єяιт ιη νσłυρтαтє νєłιт"
-" єѕѕє ¢ιłłυм ∂σłσяє єυ ƒυgιαт ηυłłα ραяιαтυя. єχ¢єρтєυя ѕιηт σ¢¢αє¢αт "
-"¢υρι∂αтαт ηση ρяσι∂єηт, ѕυηт ιη ¢υłρα qυι σƒƒι¢ια ∂єѕєяυηт мσłłιт#"
-
-#: openedx/features/learner_profile/static/learner_profile/templates/share_modal.underscore
-msgid ""
-"Create a {link_start}Mozilla Backpack{link_end} account, or log in to your "
-"existing account"
-msgstr ""
-"Çréäté ä {link_start}Mözïllä Bäçkpäçk{link_end} äççöünt, ör lög ïn tö ýöür "
-"éxïstïng äççöünt Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αмєт, ¢σηѕє¢тєтυ#"
-
-#: openedx/features/learner_profile/static/learner_profile/templates/share_modal.underscore
-msgid ""
-"{download_link_start}Download this image (right-click or option-click, save "
-"as){link_end} and then {upload_link_start}upload{link_end} it to your "
-"backpack."
-msgstr ""
-"{download_link_start}Döwnlöäd thïs ïmägé (rïght-çlïçk ör öptïön-çlïçk, sävé "
-"äs){link_end} änd thén {upload_link_start}üplöäd{link_end} ït tö ýöür "
-"ßäçkpäçk. Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт#"
-
 #: cms/templates/js/access-editor.underscore
 msgid "Limit Access"
 msgstr "Lïmït Àççéss Ⱡ'σяєм ιρѕυм ∂σłσя ѕ#"
diff --git a/conf/locale/es_419/LC_MESSAGES/django.mo b/conf/locale/es_419/LC_MESSAGES/django.mo
index e5487617473c..0415da9a7062 100644
Binary files a/conf/locale/es_419/LC_MESSAGES/django.mo and b/conf/locale/es_419/LC_MESSAGES/django.mo differ
diff --git a/conf/locale/es_419/LC_MESSAGES/django.po b/conf/locale/es_419/LC_MESSAGES/django.po
index ff394f49a7f4..8756d2448087 100644
--- a/conf/locale/es_419/LC_MESSAGES/django.po
+++ b/conf/locale/es_419/LC_MESSAGES/django.po
@@ -3969,12 +3969,12 @@ msgid "Good"
 msgstr "Bien"
 
 #. Translators: Replier commented on "your" response to your post
-#: lms/djangoapps/discussion/rest_api/utils.py
+#: lms/djangoapps/discussion/rest_api/discussions_notifications.py
 msgid "your"
 msgstr "su"
 
 #. Translators: Replier commented on "their" response to your post
-#: lms/djangoapps/discussion/rest_api/utils.py
+#: lms/djangoapps/discussion/rest_api/discussions_notifications.py
 msgid "their"
 msgstr "su"
 
@@ -8025,6 +8025,25 @@ msgstr ""
 "<{p}><{strong}>{username}</{strong}> preguntó "
 "<{strong}>{post_title}</{strong}></{p}>"
 
+#: openedx/core/djangoapps/notifications/base_notification.py
+#, python-brace-format
+msgid ""
+"<{p}><{strong}>{replier_name}</{strong}> responded to a post you’re "
+"following: <{strong}>{post_title}</{strong}></{p}>"
+msgstr ""
+"<{p}><{strong}>{replier_name}</{strong}> respondió a su publicación "
+"<{strong}>{post_title}</{strong}></{p}>"
+
+#: openedx/core/djangoapps/notifications/base_notification.py
+#, python-brace-format
+msgid ""
+"<{p}><{strong}>{replier_name}</{strong}> commented on {author_name}'s "
+"response in a post you’re following <{strong}>{post_title}</{strong}></{p}>"
+msgstr ""
+"<{p}><{strong}>{replier_name}</{strong}> respondió el "
+"<{strong}>{author_name}</{strong}> respuesta a su publicación "
+"<{strong}>{post_title}</{strong}></{p}>"
+
 #: openedx/core/djangoapps/notifications/base_notification.py
 msgid ""
 "Notifications for responses and comments on your posts, and the ones you’re "
diff --git a/conf/locale/es_419/LC_MESSAGES/djangojs.po b/conf/locale/es_419/LC_MESSAGES/djangojs.po
index 81688ff41598..7772c645317f 100644
--- a/conf/locale/es_419/LC_MESSAGES/djangojs.po
+++ b/conf/locale/es_419/LC_MESSAGES/djangojs.po
@@ -182,7 +182,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: edx-platform\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2023-09-17 20:42+0000\n"
+"POT-Creation-Date: 2023-10-08 20:42+0000\n"
 "PO-Revision-Date: 2014-06-11 15:18+0000\n"
 "Last-Translator: Jesica Greco, 2023\n"
 "Language-Team: Spanish (Latin America) (http://app.transifex.com/open-edx/edx-platform/language/es_419/)\n"
diff --git a/conf/locale/eu_ES/LC_MESSAGES/django.po b/conf/locale/eu_ES/LC_MESSAGES/django.po
index 7b3ee3252146..3d2c37bcd904 100644
--- a/conf/locale/eu_ES/LC_MESSAGES/django.po
+++ b/conf/locale/eu_ES/LC_MESSAGES/django.po
@@ -64,7 +64,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.1a\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2023-09-17 20:43+0000\n"
+"POT-Creation-Date: 2023-10-08 20:43+0000\n"
 "PO-Revision-Date: 2019-01-20 20:43+0000\n"
 "Last-Translator: Abel Camacho <abelcama@gmail.com>, 2019\n"
 "Language-Team: Basque (Spain) (https://app.transifex.com/open-edx/teams/6205/eu_ES/)\n"
@@ -3315,12 +3315,12 @@ msgid "Good"
 msgstr "Ona"
 
 #. Translators: Replier commented on "your" response to your post
-#: lms/djangoapps/discussion/rest_api/utils.py
+#: lms/djangoapps/discussion/rest_api/discussions_notifications.py
 msgid "your"
 msgstr ""
 
 #. Translators: Replier commented on "their" response to your post
-#: lms/djangoapps/discussion/rest_api/utils.py
+#: lms/djangoapps/discussion/rest_api/discussions_notifications.py
 msgid "their"
 msgstr ""
 
@@ -6961,6 +6961,20 @@ msgid ""
 "<{strong}>{post_title}</{strong}></{p}>"
 msgstr ""
 
+#: openedx/core/djangoapps/notifications/base_notification.py
+#, python-brace-format
+msgid ""
+"<{p}><{strong}>{replier_name}</{strong}> responded to a post you’re "
+"following: <{strong}>{post_title}</{strong}></{p}>"
+msgstr ""
+
+#: openedx/core/djangoapps/notifications/base_notification.py
+#, python-brace-format
+msgid ""
+"<{p}><{strong}>{replier_name}</{strong}> commented on {author_name}'s "
+"response in a post you’re following <{strong}>{post_title}</{strong}></{p}>"
+msgstr ""
+
 #: openedx/core/djangoapps/notifications/base_notification.py
 msgid ""
 "Notifications for responses and comments on your posts, and the ones you’re "
diff --git a/conf/locale/eu_ES/LC_MESSAGES/djangojs.po b/conf/locale/eu_ES/LC_MESSAGES/djangojs.po
index 93b1d94852be..c6202f7069f7 100644
--- a/conf/locale/eu_ES/LC_MESSAGES/djangojs.po
+++ b/conf/locale/eu_ES/LC_MESSAGES/djangojs.po
@@ -50,7 +50,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: edx-platform\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2023-09-17 20:42+0000\n"
+"POT-Creation-Date: 2023-10-08 20:42+0000\n"
 "PO-Revision-Date: 2014-06-11 15:18+0000\n"
 "Last-Translator: Abel Camacho <abelcama@gmail.com>, 2017,2019-2020\n"
 "Language-Team: Basque (Spain) (http://app.transifex.com/open-edx/edx-platform/language/eu_ES/)\n"
diff --git a/conf/locale/fa_IR/LC_MESSAGES/django.po b/conf/locale/fa_IR/LC_MESSAGES/django.po
index 1e4087dc0c80..973512ea8acd 100644
--- a/conf/locale/fa_IR/LC_MESSAGES/django.po
+++ b/conf/locale/fa_IR/LC_MESSAGES/django.po
@@ -134,7 +134,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.1a\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2023-09-24 20:43+0000\n"
+"POT-Creation-Date: 2023-10-15 20:42+0000\n"
 "PO-Revision-Date: 2019-01-20 20:43+0000\n"
 "Last-Translator: Somaye Joolaee, 2022\n"
 "Language-Team: Persian (Iran) (https://app.transifex.com/open-edx/teams/6205/fa_IR/)\n"
@@ -3664,12 +3664,12 @@ msgid "Good"
 msgstr "خوب"
 
 #. Translators: Replier commented on "your" response to your post
-#: lms/djangoapps/discussion/rest_api/utils.py
+#: lms/djangoapps/discussion/rest_api/discussions_notifications.py
 msgid "your"
 msgstr ""
 
 #. Translators: Replier commented on "their" response to your post
-#: lms/djangoapps/discussion/rest_api/utils.py
+#: lms/djangoapps/discussion/rest_api/discussions_notifications.py
 msgid "their"
 msgstr ""
 
@@ -7596,6 +7596,20 @@ msgid ""
 "<{strong}>{post_title}</{strong}></{p}>"
 msgstr ""
 
+#: openedx/core/djangoapps/notifications/base_notification.py
+#, python-brace-format
+msgid ""
+"<{p}><{strong}>{replier_name}</{strong}> responded to a post you’re "
+"following: <{strong}>{post_title}</{strong}></{p}>"
+msgstr ""
+
+#: openedx/core/djangoapps/notifications/base_notification.py
+#, python-brace-format
+msgid ""
+"<{p}><{strong}>{replier_name}</{strong}> commented on {author_name}'s "
+"response in a post you’re following <{strong}>{post_title}</{strong}></{p}>"
+msgstr ""
+
 #: openedx/core/djangoapps/notifications/base_notification.py
 msgid ""
 "Notifications for responses and comments on your posts, and the ones you’re "
diff --git a/conf/locale/fa_IR/LC_MESSAGES/djangojs.po b/conf/locale/fa_IR/LC_MESSAGES/djangojs.po
index 24db4fbf75a6..39d4a4a06f88 100644
--- a/conf/locale/fa_IR/LC_MESSAGES/djangojs.po
+++ b/conf/locale/fa_IR/LC_MESSAGES/djangojs.po
@@ -88,7 +88,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: edx-platform\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2023-09-17 20:42+0000\n"
+"POT-Creation-Date: 2023-10-08 20:42+0000\n"
 "PO-Revision-Date: 2014-06-11 15:18+0000\n"
 "Last-Translator: SeyedMahdi Saeid <saeid@edspirit.com>, 2023\n"
 "Language-Team: Persian (Iran) (http://app.transifex.com/open-edx/edx-platform/language/fa_IR/)\n"
diff --git a/conf/locale/fr/LC_MESSAGES/django.po b/conf/locale/fr/LC_MESSAGES/django.po
index b530cd2f9ce9..908197c5c5dd 100644
--- a/conf/locale/fr/LC_MESSAGES/django.po
+++ b/conf/locale/fr/LC_MESSAGES/django.po
@@ -316,7 +316,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.1a\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2023-09-17 20:43+0000\n"
+"POT-Creation-Date: 2023-10-08 20:43+0000\n"
 "PO-Revision-Date: 2019-01-20 20:43+0000\n"
 "Last-Translator: Alexandre DS <alexandre@cleverm8.com>, 2020\n"
 "Language-Team: French (https://app.transifex.com/open-edx/teams/6205/fr/)\n"
@@ -3982,12 +3982,12 @@ msgid "Good"
 msgstr "Bien"
 
 #. Translators: Replier commented on "your" response to your post
-#: lms/djangoapps/discussion/rest_api/utils.py
+#: lms/djangoapps/discussion/rest_api/discussions_notifications.py
 msgid "your"
 msgstr ""
 
 #. Translators: Replier commented on "their" response to your post
-#: lms/djangoapps/discussion/rest_api/utils.py
+#: lms/djangoapps/discussion/rest_api/discussions_notifications.py
 msgid "their"
 msgstr ""
 
@@ -8011,6 +8011,20 @@ msgid ""
 "<{strong}>{post_title}</{strong}></{p}>"
 msgstr ""
 
+#: openedx/core/djangoapps/notifications/base_notification.py
+#, python-brace-format
+msgid ""
+"<{p}><{strong}>{replier_name}</{strong}> responded to a post you’re "
+"following: <{strong}>{post_title}</{strong}></{p}>"
+msgstr ""
+
+#: openedx/core/djangoapps/notifications/base_notification.py
+#, python-brace-format
+msgid ""
+"<{p}><{strong}>{replier_name}</{strong}> commented on {author_name}'s "
+"response in a post you’re following <{strong}>{post_title}</{strong}></{p}>"
+msgstr ""
+
 #: openedx/core/djangoapps/notifications/base_notification.py
 msgid ""
 "Notifications for responses and comments on your posts, and the ones you’re "
diff --git a/conf/locale/fr/LC_MESSAGES/djangojs.po b/conf/locale/fr/LC_MESSAGES/djangojs.po
index ea4134d7730f..ac60a46e9454 100644
--- a/conf/locale/fr/LC_MESSAGES/djangojs.po
+++ b/conf/locale/fr/LC_MESSAGES/djangojs.po
@@ -220,7 +220,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: edx-platform\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2023-09-17 20:42+0000\n"
+"POT-Creation-Date: 2023-10-08 20:42+0000\n"
 "PO-Revision-Date: 2014-06-11 15:18+0000\n"
 "Last-Translator: Pierre Mailhot <pierre.mailhot@gmail.com>, 2023\n"
 "Language-Team: French (http://app.transifex.com/open-edx/edx-platform/language/fr/)\n"
diff --git a/conf/locale/he/LC_MESSAGES/django.po b/conf/locale/he/LC_MESSAGES/django.po
index d29bdaef1f8a..2ed94f23c8a5 100644
--- a/conf/locale/he/LC_MESSAGES/django.po
+++ b/conf/locale/he/LC_MESSAGES/django.po
@@ -19121,10 +19121,6 @@ msgid ""
 "subjects."
 msgstr "עיין בקורסים שהושקו לאחרונה וראה מה חדש בנושאים האהובים עליך."
 
-#: themes/edx.org/lms/templates/dashboard.html
-msgid "Take advantage of free coaching!"
-msgstr ""
-
 #: themes/edx.org/lms/templates/dashboard.html
 msgid "Get Started"
 msgstr ""
diff --git a/conf/locale/hi/LC_MESSAGES/django.po b/conf/locale/hi/LC_MESSAGES/django.po
index 3ecb5136ab19..a7bca1b22ad8 100644
--- a/conf/locale/hi/LC_MESSAGES/django.po
+++ b/conf/locale/hi/LC_MESSAGES/django.po
@@ -18201,10 +18201,6 @@ msgid ""
 "subjects."
 msgstr ""
 
-#: themes/edx.org/lms/templates/dashboard.html
-msgid "Take advantage of free coaching!"
-msgstr ""
-
 #: themes/edx.org/lms/templates/dashboard.html
 msgid "Get Started"
 msgstr ""
diff --git a/conf/locale/id/LC_MESSAGES/django.po b/conf/locale/id/LC_MESSAGES/django.po
index f4630eafce0a..8dbe2acb83a8 100644
--- a/conf/locale/id/LC_MESSAGES/django.po
+++ b/conf/locale/id/LC_MESSAGES/django.po
@@ -106,7 +106,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.1a\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2023-09-17 20:43+0000\n"
+"POT-Creation-Date: 2023-10-08 20:43+0000\n"
 "PO-Revision-Date: 2019-01-20 20:43+0000\n"
 "Last-Translator: Aprisa Chrysantina <aprisa.chrysantina@gmail.com>, 2019\n"
 "Language-Team: Indonesian (https://app.transifex.com/open-edx/teams/6205/id/)\n"
@@ -3463,12 +3463,12 @@ msgid "Good"
 msgstr "Baik"
 
 #. Translators: Replier commented on "your" response to your post
-#: lms/djangoapps/discussion/rest_api/utils.py
+#: lms/djangoapps/discussion/rest_api/discussions_notifications.py
 msgid "your"
 msgstr ""
 
 #. Translators: Replier commented on "their" response to your post
-#: lms/djangoapps/discussion/rest_api/utils.py
+#: lms/djangoapps/discussion/rest_api/discussions_notifications.py
 msgid "their"
 msgstr ""
 
@@ -7184,6 +7184,20 @@ msgid ""
 "<{strong}>{post_title}</{strong}></{p}>"
 msgstr ""
 
+#: openedx/core/djangoapps/notifications/base_notification.py
+#, python-brace-format
+msgid ""
+"<{p}><{strong}>{replier_name}</{strong}> responded to a post you’re "
+"following: <{strong}>{post_title}</{strong}></{p}>"
+msgstr ""
+
+#: openedx/core/djangoapps/notifications/base_notification.py
+#, python-brace-format
+msgid ""
+"<{p}><{strong}>{replier_name}</{strong}> commented on {author_name}'s "
+"response in a post you’re following <{strong}>{post_title}</{strong}></{p}>"
+msgstr ""
+
 #: openedx/core/djangoapps/notifications/base_notification.py
 msgid ""
 "Notifications for responses and comments on your posts, and the ones you’re "
diff --git a/conf/locale/id/LC_MESSAGES/djangojs.po b/conf/locale/id/LC_MESSAGES/djangojs.po
index fab593b619b1..2da633adeb18 100644
--- a/conf/locale/id/LC_MESSAGES/djangojs.po
+++ b/conf/locale/id/LC_MESSAGES/djangojs.po
@@ -84,7 +84,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: edx-platform\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2023-09-17 20:42+0000\n"
+"POT-Creation-Date: 2023-10-08 20:42+0000\n"
 "PO-Revision-Date: 2014-06-11 15:18+0000\n"
 "Last-Translator: Faizar Septiawan <faizarsangster@gmail.com>, 2023\n"
 "Language-Team: Indonesian (http://app.transifex.com/open-edx/edx-platform/language/id/)\n"
diff --git a/conf/locale/it_IT/LC_MESSAGES/django.po b/conf/locale/it_IT/LC_MESSAGES/django.po
index b9f7728f03ca..13faaa463aeb 100644
--- a/conf/locale/it_IT/LC_MESSAGES/django.po
+++ b/conf/locale/it_IT/LC_MESSAGES/django.po
@@ -3811,12 +3811,12 @@ msgid "Good"
 msgstr "Buono"
 
 #. Translators: Replier commented on "your" response to your post
-#: lms/djangoapps/discussion/rest_api/utils.py
+#: lms/djangoapps/discussion/rest_api/discussions_notifications.py
 msgid "your"
 msgstr ""
 
 #. Translators: Replier commented on "their" response to your post
-#: lms/djangoapps/discussion/rest_api/utils.py
+#: lms/djangoapps/discussion/rest_api/discussions_notifications.py
 msgid "their"
 msgstr ""
 
@@ -7858,6 +7858,20 @@ msgid ""
 "<{strong}>{post_title}</{strong}></{p}>"
 msgstr ""
 
+#: openedx/core/djangoapps/notifications/base_notification.py
+#, python-brace-format
+msgid ""
+"<{p}><{strong}>{replier_name}</{strong}> responded to a post you’re "
+"following: <{strong}>{post_title}</{strong}></{p}>"
+msgstr ""
+
+#: openedx/core/djangoapps/notifications/base_notification.py
+#, python-brace-format
+msgid ""
+"<{p}><{strong}>{replier_name}</{strong}> commented on {author_name}'s "
+"response in a post you’re following <{strong}>{post_title}</{strong}></{p}>"
+msgstr ""
+
 #: openedx/core/djangoapps/notifications/base_notification.py
 msgid ""
 "Notifications for responses and comments on your posts, and the ones you’re "
diff --git a/conf/locale/it_IT/LC_MESSAGES/djangojs.po b/conf/locale/it_IT/LC_MESSAGES/djangojs.po
index fc3081764fd6..d7b7a8a435aa 100644
--- a/conf/locale/it_IT/LC_MESSAGES/djangojs.po
+++ b/conf/locale/it_IT/LC_MESSAGES/djangojs.po
@@ -113,7 +113,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: edx-platform\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2023-09-17 20:42+0000\n"
+"POT-Creation-Date: 2023-10-08 20:42+0000\n"
 "PO-Revision-Date: 2014-06-11 15:18+0000\n"
 "Last-Translator: Ilaria Botti <ilabotti@gmail.com>, 2022\n"
 "Language-Team: Italian (Italy) (http://app.transifex.com/open-edx/edx-platform/language/it_IT/)\n"
diff --git a/conf/locale/ja_JP/LC_MESSAGES/django.po b/conf/locale/ja_JP/LC_MESSAGES/django.po
index dae850983138..f5dceb99c8f7 100644
--- a/conf/locale/ja_JP/LC_MESSAGES/django.po
+++ b/conf/locale/ja_JP/LC_MESSAGES/django.po
@@ -114,7 +114,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.1a\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2023-09-17 20:43+0000\n"
+"POT-Creation-Date: 2023-10-08 20:43+0000\n"
 "PO-Revision-Date: 2019-01-20 20:43+0000\n"
 "Last-Translator: Waheed Ahmed <waheed@edx.org>, 2019\n"
 "Language-Team: Japanese (Japan) (https://app.transifex.com/open-edx/teams/6205/ja_JP/)\n"
@@ -3311,12 +3311,12 @@ msgid "Good"
 msgstr "良い"
 
 #. Translators: Replier commented on "your" response to your post
-#: lms/djangoapps/discussion/rest_api/utils.py
+#: lms/djangoapps/discussion/rest_api/discussions_notifications.py
 msgid "your"
 msgstr ""
 
 #. Translators: Replier commented on "their" response to your post
-#: lms/djangoapps/discussion/rest_api/utils.py
+#: lms/djangoapps/discussion/rest_api/discussions_notifications.py
 msgid "their"
 msgstr ""
 
@@ -6896,6 +6896,20 @@ msgid ""
 "<{strong}>{post_title}</{strong}></{p}>"
 msgstr ""
 
+#: openedx/core/djangoapps/notifications/base_notification.py
+#, python-brace-format
+msgid ""
+"<{p}><{strong}>{replier_name}</{strong}> responded to a post you’re "
+"following: <{strong}>{post_title}</{strong}></{p}>"
+msgstr ""
+
+#: openedx/core/djangoapps/notifications/base_notification.py
+#, python-brace-format
+msgid ""
+"<{p}><{strong}>{replier_name}</{strong}> commented on {author_name}'s "
+"response in a post you’re following <{strong}>{post_title}</{strong}></{p}>"
+msgstr ""
+
 #: openedx/core/djangoapps/notifications/base_notification.py
 msgid ""
 "Notifications for responses and comments on your posts, and the ones you’re "
diff --git a/conf/locale/ja_JP/LC_MESSAGES/djangojs.po b/conf/locale/ja_JP/LC_MESSAGES/djangojs.po
index 8bcde9742439..330c7a809986 100644
--- a/conf/locale/ja_JP/LC_MESSAGES/djangojs.po
+++ b/conf/locale/ja_JP/LC_MESSAGES/djangojs.po
@@ -78,7 +78,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: edx-platform\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2023-09-17 20:42+0000\n"
+"POT-Creation-Date: 2023-10-08 20:42+0000\n"
 "PO-Revision-Date: 2014-06-11 15:18+0000\n"
 "Last-Translator: Kyoto University <edxkyotoux@gmail.com>, 2017\n"
 "Language-Team: Japanese (Japan) (http://app.transifex.com/open-edx/edx-platform/language/ja_JP/)\n"
diff --git a/conf/locale/ka/LC_MESSAGES/django.po b/conf/locale/ka/LC_MESSAGES/django.po
index 942530cd55a3..936221fd8072 100644
--- a/conf/locale/ka/LC_MESSAGES/django.po
+++ b/conf/locale/ka/LC_MESSAGES/django.po
@@ -60,7 +60,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.1a\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2023-09-17 20:43+0000\n"
+"POT-Creation-Date: 2023-10-08 20:43+0000\n"
 "PO-Revision-Date: 2019-01-20 20:43+0000\n"
 "Last-Translator: Waheed Ahmed <waheed@edx.org>, 2019\n"
 "Language-Team: Georgian (https://app.transifex.com/open-edx/teams/6205/ka/)\n"
@@ -3372,12 +3372,12 @@ msgid "Good"
 msgstr "კარგია"
 
 #. Translators: Replier commented on "your" response to your post
-#: lms/djangoapps/discussion/rest_api/utils.py
+#: lms/djangoapps/discussion/rest_api/discussions_notifications.py
 msgid "your"
 msgstr ""
 
 #. Translators: Replier commented on "their" response to your post
-#: lms/djangoapps/discussion/rest_api/utils.py
+#: lms/djangoapps/discussion/rest_api/discussions_notifications.py
 msgid "their"
 msgstr ""
 
@@ -7076,6 +7076,20 @@ msgid ""
 "<{strong}>{post_title}</{strong}></{p}>"
 msgstr ""
 
+#: openedx/core/djangoapps/notifications/base_notification.py
+#, python-brace-format
+msgid ""
+"<{p}><{strong}>{replier_name}</{strong}> responded to a post you’re "
+"following: <{strong}>{post_title}</{strong}></{p}>"
+msgstr ""
+
+#: openedx/core/djangoapps/notifications/base_notification.py
+#, python-brace-format
+msgid ""
+"<{p}><{strong}>{replier_name}</{strong}> commented on {author_name}'s "
+"response in a post you’re following <{strong}>{post_title}</{strong}></{p}>"
+msgstr ""
+
 #: openedx/core/djangoapps/notifications/base_notification.py
 msgid ""
 "Notifications for responses and comments on your posts, and the ones you’re "
diff --git a/conf/locale/ka/LC_MESSAGES/djangojs.po b/conf/locale/ka/LC_MESSAGES/djangojs.po
index 20eaf4425c99..5705e22be251 100644
--- a/conf/locale/ka/LC_MESSAGES/djangojs.po
+++ b/conf/locale/ka/LC_MESSAGES/djangojs.po
@@ -56,7 +56,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: edx-platform\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2023-09-17 20:42+0000\n"
+"POT-Creation-Date: 2023-10-08 20:42+0000\n"
 "PO-Revision-Date: 2014-06-11 15:18+0000\n"
 "Last-Translator: Lasha Kokilashvili, 2018\n"
 "Language-Team: Georgian (http://app.transifex.com/open-edx/edx-platform/language/ka/)\n"
diff --git a/conf/locale/ko_KR/LC_MESSAGES/django.po b/conf/locale/ko_KR/LC_MESSAGES/django.po
index 88054ae64f9d..3992de5d8d70 100644
--- a/conf/locale/ko_KR/LC_MESSAGES/django.po
+++ b/conf/locale/ko_KR/LC_MESSAGES/django.po
@@ -17370,10 +17370,6 @@ msgid ""
 "subjects."
 msgstr ""
 
-#: themes/edx.org/lms/templates/dashboard.html
-msgid "Take advantage of free coaching!"
-msgstr ""
-
 #: themes/edx.org/lms/templates/dashboard.html
 msgid "Get Started"
 msgstr ""
diff --git a/conf/locale/lt_LT/LC_MESSAGES/django.po b/conf/locale/lt_LT/LC_MESSAGES/django.po
index 7867ae401c44..18fb6c32e4da 100644
--- a/conf/locale/lt_LT/LC_MESSAGES/django.po
+++ b/conf/locale/lt_LT/LC_MESSAGES/django.po
@@ -72,7 +72,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.1a\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2023-09-17 20:43+0000\n"
+"POT-Creation-Date: 2023-10-08 20:43+0000\n"
 "PO-Revision-Date: 2019-01-20 20:43+0000\n"
 "Last-Translator: Waheed Ahmed <waheed@edx.org>, 2019\n"
 "Language-Team: Lithuanian (Lithuania) (https://app.transifex.com/open-edx/teams/6205/lt_LT/)\n"
@@ -3266,12 +3266,12 @@ msgid "Good"
 msgstr ""
 
 #. Translators: Replier commented on "your" response to your post
-#: lms/djangoapps/discussion/rest_api/utils.py
+#: lms/djangoapps/discussion/rest_api/discussions_notifications.py
 msgid "your"
 msgstr ""
 
 #. Translators: Replier commented on "their" response to your post
-#: lms/djangoapps/discussion/rest_api/utils.py
+#: lms/djangoapps/discussion/rest_api/discussions_notifications.py
 msgid "their"
 msgstr ""
 
@@ -6811,6 +6811,20 @@ msgid ""
 "<{strong}>{post_title}</{strong}></{p}>"
 msgstr ""
 
+#: openedx/core/djangoapps/notifications/base_notification.py
+#, python-brace-format
+msgid ""
+"<{p}><{strong}>{replier_name}</{strong}> responded to a post you’re "
+"following: <{strong}>{post_title}</{strong}></{p}>"
+msgstr ""
+
+#: openedx/core/djangoapps/notifications/base_notification.py
+#, python-brace-format
+msgid ""
+"<{p}><{strong}>{replier_name}</{strong}> commented on {author_name}'s "
+"response in a post you’re following <{strong}>{post_title}</{strong}></{p}>"
+msgstr ""
+
 #: openedx/core/djangoapps/notifications/base_notification.py
 msgid ""
 "Notifications for responses and comments on your posts, and the ones you’re "
diff --git a/conf/locale/lt_LT/LC_MESSAGES/djangojs.po b/conf/locale/lt_LT/LC_MESSAGES/djangojs.po
index 4c162463f051..01e2a4c66e99 100644
--- a/conf/locale/lt_LT/LC_MESSAGES/djangojs.po
+++ b/conf/locale/lt_LT/LC_MESSAGES/djangojs.po
@@ -50,7 +50,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: edx-platform\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2023-09-17 20:42+0000\n"
+"POT-Creation-Date: 2023-10-08 20:42+0000\n"
 "PO-Revision-Date: 2014-06-11 15:18+0000\n"
 "Last-Translator: Riina <ciairdabar@yahoo.com>, 2014-2015\n"
 "Language-Team: Lithuanian (Lithuania) (http://app.transifex.com/open-edx/edx-platform/language/lt_LT/)\n"
diff --git a/conf/locale/lv/LC_MESSAGES/django.po b/conf/locale/lv/LC_MESSAGES/django.po
index ded1241d9486..5b107efa2f2e 100644
--- a/conf/locale/lv/LC_MESSAGES/django.po
+++ b/conf/locale/lv/LC_MESSAGES/django.po
@@ -49,7 +49,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.1a\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2023-09-17 20:43+0000\n"
+"POT-Creation-Date: 2023-10-08 20:43+0000\n"
 "PO-Revision-Date: 2019-01-20 20:43+0000\n"
 "Last-Translator: Waheed Ahmed <waheed@edx.org>, 2019\n"
 "Language-Team: Latvian (https://app.transifex.com/open-edx/teams/6205/lv/)\n"
@@ -3436,12 +3436,12 @@ msgid "Good"
 msgstr "Labi"
 
 #. Translators: Replier commented on "your" response to your post
-#: lms/djangoapps/discussion/rest_api/utils.py
+#: lms/djangoapps/discussion/rest_api/discussions_notifications.py
 msgid "your"
 msgstr ""
 
 #. Translators: Replier commented on "their" response to your post
-#: lms/djangoapps/discussion/rest_api/utils.py
+#: lms/djangoapps/discussion/rest_api/discussions_notifications.py
 msgid "their"
 msgstr ""
 
@@ -7212,6 +7212,20 @@ msgid ""
 "<{strong}>{post_title}</{strong}></{p}>"
 msgstr ""
 
+#: openedx/core/djangoapps/notifications/base_notification.py
+#, python-brace-format
+msgid ""
+"<{p}><{strong}>{replier_name}</{strong}> responded to a post you’re "
+"following: <{strong}>{post_title}</{strong}></{p}>"
+msgstr ""
+
+#: openedx/core/djangoapps/notifications/base_notification.py
+#, python-brace-format
+msgid ""
+"<{p}><{strong}>{replier_name}</{strong}> commented on {author_name}'s "
+"response in a post you’re following <{strong}>{post_title}</{strong}></{p}>"
+msgstr ""
+
 #: openedx/core/djangoapps/notifications/base_notification.py
 msgid ""
 "Notifications for responses and comments on your posts, and the ones you’re "
diff --git a/conf/locale/lv/LC_MESSAGES/djangojs.po b/conf/locale/lv/LC_MESSAGES/djangojs.po
index 4dea7b341695..584ef278f71c 100644
--- a/conf/locale/lv/LC_MESSAGES/djangojs.po
+++ b/conf/locale/lv/LC_MESSAGES/djangojs.po
@@ -40,7 +40,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: edx-platform\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2023-09-17 20:42+0000\n"
+"POT-Creation-Date: 2023-10-08 20:42+0000\n"
 "PO-Revision-Date: 2014-06-11 15:18+0000\n"
 "Last-Translator: LTMC Latvijas Tiesnešu mācību centrs <ltmc.training@gmail.com>, 2019\n"
 "Language-Team: Latvian (http://app.transifex.com/open-edx/edx-platform/language/lv/)\n"
diff --git a/conf/locale/mn/LC_MESSAGES/django.po b/conf/locale/mn/LC_MESSAGES/django.po
index f98e92c2f33a..0960b5b29c06 100644
--- a/conf/locale/mn/LC_MESSAGES/django.po
+++ b/conf/locale/mn/LC_MESSAGES/django.po
@@ -74,7 +74,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.1a\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2023-09-17 20:43+0000\n"
+"POT-Creation-Date: 2023-10-08 20:43+0000\n"
 "PO-Revision-Date: 2019-01-20 20:43+0000\n"
 "Last-Translator: Waheed Ahmed <waheed@edx.org>, 2019\n"
 "Language-Team: Mongolian (https://app.transifex.com/open-edx/teams/6205/mn/)\n"
@@ -3292,12 +3292,12 @@ msgid "Good"
 msgstr ""
 
 #. Translators: Replier commented on "your" response to your post
-#: lms/djangoapps/discussion/rest_api/utils.py
+#: lms/djangoapps/discussion/rest_api/discussions_notifications.py
 msgid "your"
 msgstr ""
 
 #. Translators: Replier commented on "their" response to your post
-#: lms/djangoapps/discussion/rest_api/utils.py
+#: lms/djangoapps/discussion/rest_api/discussions_notifications.py
 msgid "their"
 msgstr ""
 
@@ -6868,6 +6868,20 @@ msgid ""
 "<{strong}>{post_title}</{strong}></{p}>"
 msgstr ""
 
+#: openedx/core/djangoapps/notifications/base_notification.py
+#, python-brace-format
+msgid ""
+"<{p}><{strong}>{replier_name}</{strong}> responded to a post you’re "
+"following: <{strong}>{post_title}</{strong}></{p}>"
+msgstr ""
+
+#: openedx/core/djangoapps/notifications/base_notification.py
+#, python-brace-format
+msgid ""
+"<{p}><{strong}>{replier_name}</{strong}> commented on {author_name}'s "
+"response in a post you’re following <{strong}>{post_title}</{strong}></{p}>"
+msgstr ""
+
 #: openedx/core/djangoapps/notifications/base_notification.py
 msgid ""
 "Notifications for responses and comments on your posts, and the ones you’re "
diff --git a/conf/locale/mn/LC_MESSAGES/djangojs.po b/conf/locale/mn/LC_MESSAGES/djangojs.po
index a5fbdfbfaa83..08a83d7d7f91 100644
--- a/conf/locale/mn/LC_MESSAGES/djangojs.po
+++ b/conf/locale/mn/LC_MESSAGES/djangojs.po
@@ -63,7 +63,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: edx-platform\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2023-09-17 20:42+0000\n"
+"POT-Creation-Date: 2023-10-08 20:42+0000\n"
 "PO-Revision-Date: 2014-06-11 15:18+0000\n"
 "Last-Translator: Myagmarjav Enkhbileg <miigaa.lucky@gmail.com>, 2018\n"
 "Language-Team: Mongolian (http://app.transifex.com/open-edx/edx-platform/language/mn/)\n"
diff --git a/conf/locale/pl/LC_MESSAGES/django.po b/conf/locale/pl/LC_MESSAGES/django.po
index f0730948028f..f8c273e0b6ec 100644
--- a/conf/locale/pl/LC_MESSAGES/django.po
+++ b/conf/locale/pl/LC_MESSAGES/django.po
@@ -150,7 +150,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.1a\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2023-09-17 20:43+0000\n"
+"POT-Creation-Date: 2023-10-08 20:43+0000\n"
 "PO-Revision-Date: 2019-01-20 20:43+0000\n"
 "Last-Translator: Marcin Miłek, 2022\n"
 "Language-Team: Polish (https://app.transifex.com/open-edx/teams/6205/pl/)\n"
@@ -3554,12 +3554,12 @@ msgid "Good"
 msgstr "Dobrze"
 
 #. Translators: Replier commented on "your" response to your post
-#: lms/djangoapps/discussion/rest_api/utils.py
+#: lms/djangoapps/discussion/rest_api/discussions_notifications.py
 msgid "your"
 msgstr ""
 
 #. Translators: Replier commented on "their" response to your post
-#: lms/djangoapps/discussion/rest_api/utils.py
+#: lms/djangoapps/discussion/rest_api/discussions_notifications.py
 msgid "their"
 msgstr ""
 
@@ -7340,6 +7340,20 @@ msgid ""
 "<{strong}>{post_title}</{strong}></{p}>"
 msgstr ""
 
+#: openedx/core/djangoapps/notifications/base_notification.py
+#, python-brace-format
+msgid ""
+"<{p}><{strong}>{replier_name}</{strong}> responded to a post you’re "
+"following: <{strong}>{post_title}</{strong}></{p}>"
+msgstr ""
+
+#: openedx/core/djangoapps/notifications/base_notification.py
+#, python-brace-format
+msgid ""
+"<{p}><{strong}>{replier_name}</{strong}> commented on {author_name}'s "
+"response in a post you’re following <{strong}>{post_title}</{strong}></{p}>"
+msgstr ""
+
 #: openedx/core/djangoapps/notifications/base_notification.py
 msgid ""
 "Notifications for responses and comments on your posts, and the ones you’re "
diff --git a/conf/locale/pl/LC_MESSAGES/djangojs.po b/conf/locale/pl/LC_MESSAGES/djangojs.po
index e9a391e6c78d..98d7624c18a2 100644
--- a/conf/locale/pl/LC_MESSAGES/djangojs.po
+++ b/conf/locale/pl/LC_MESSAGES/djangojs.po
@@ -116,7 +116,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: edx-platform\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2023-09-17 20:42+0000\n"
+"POT-Creation-Date: 2023-10-08 20:42+0000\n"
 "PO-Revision-Date: 2014-06-11 15:18+0000\n"
 "Last-Translator: Klara Sielicka-Baryłka, 2022\n"
 "Language-Team: Polish (http://app.transifex.com/open-edx/edx-platform/language/pl/)\n"
diff --git a/conf/locale/pt_BR/LC_MESSAGES/django.po b/conf/locale/pt_BR/LC_MESSAGES/django.po
index 6d9800d190ea..ed9a19155690 100644
--- a/conf/locale/pt_BR/LC_MESSAGES/django.po
+++ b/conf/locale/pt_BR/LC_MESSAGES/django.po
@@ -19492,10 +19492,6 @@ msgid ""
 "subjects."
 msgstr ""
 
-#: themes/edx.org/lms/templates/dashboard.html
-msgid "Take advantage of free coaching!"
-msgstr ""
-
 #: themes/edx.org/lms/templates/dashboard.html
 msgid "Get Started"
 msgstr ""
diff --git a/conf/locale/pt_BR/LC_MESSAGES/djangojs.po b/conf/locale/pt_BR/LC_MESSAGES/djangojs.po
index 80dd53ef4f7f..614635706fd4 100644
--- a/conf/locale/pt_BR/LC_MESSAGES/djangojs.po
+++ b/conf/locale/pt_BR/LC_MESSAGES/djangojs.po
@@ -246,7 +246,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: edx-platform\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2023-09-17 20:42+0000\n"
+"POT-Creation-Date: 2023-10-08 20:42+0000\n"
 "PO-Revision-Date: 2014-06-11 15:18+0000\n"
 "Last-Translator: Rodrigo Rocha <prof.rodrigorocha@yahoo.com>, 2020\n"
 "Language-Team: Portuguese (Brazil) (http://app.transifex.com/open-edx/edx-platform/language/pt_BR/)\n"
diff --git a/conf/locale/pt_PT/LC_MESSAGES/django.po b/conf/locale/pt_PT/LC_MESSAGES/django.po
index a038db390378..28569e760574 100644
--- a/conf/locale/pt_PT/LC_MESSAGES/django.po
+++ b/conf/locale/pt_PT/LC_MESSAGES/django.po
@@ -3786,12 +3786,12 @@ msgid "Good"
 msgstr "Bom"
 
 #. Translators: Replier commented on "your" response to your post
-#: lms/djangoapps/discussion/rest_api/utils.py
+#: lms/djangoapps/discussion/rest_api/discussions_notifications.py
 msgid "your"
 msgstr ""
 
 #. Translators: Replier commented on "their" response to your post
-#: lms/djangoapps/discussion/rest_api/utils.py
+#: lms/djangoapps/discussion/rest_api/discussions_notifications.py
 msgid "their"
 msgstr ""
 
@@ -7817,6 +7817,20 @@ msgid ""
 "<{strong}>{post_title}</{strong}></{p}>"
 msgstr ""
 
+#: openedx/core/djangoapps/notifications/base_notification.py
+#, python-brace-format
+msgid ""
+"<{p}><{strong}>{replier_name}</{strong}> responded to a post you’re "
+"following: <{strong}>{post_title}</{strong}></{p}>"
+msgstr ""
+
+#: openedx/core/djangoapps/notifications/base_notification.py
+#, python-brace-format
+msgid ""
+"<{p}><{strong}>{replier_name}</{strong}> commented on {author_name}'s "
+"response in a post you’re following <{strong}>{post_title}</{strong}></{p}>"
+msgstr ""
+
 #: openedx/core/djangoapps/notifications/base_notification.py
 msgid ""
 "Notifications for responses and comments on your posts, and the ones you’re "
diff --git a/conf/locale/pt_PT/LC_MESSAGES/djangojs.po b/conf/locale/pt_PT/LC_MESSAGES/djangojs.po
index a3ef571d2cb1..a784860dd6f0 100644
--- a/conf/locale/pt_PT/LC_MESSAGES/djangojs.po
+++ b/conf/locale/pt_PT/LC_MESSAGES/djangojs.po
@@ -113,7 +113,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: edx-platform\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2023-09-17 20:42+0000\n"
+"POT-Creation-Date: 2023-10-08 20:42+0000\n"
 "PO-Revision-Date: 2014-06-11 15:18+0000\n"
 "Last-Translator: Ivo Branco <ivo.branco@fccn.pt>, 2021,2023\n"
 "Language-Team: Portuguese (Portugal) (http://app.transifex.com/open-edx/edx-platform/language/pt_PT/)\n"
diff --git a/conf/locale/rtl/LC_MESSAGES/django.mo b/conf/locale/rtl/LC_MESSAGES/django.mo
index ab64bced25a0..65f38f3dde3c 100644
Binary files a/conf/locale/rtl/LC_MESSAGES/django.mo and b/conf/locale/rtl/LC_MESSAGES/django.mo differ
diff --git a/conf/locale/rtl/LC_MESSAGES/django.po b/conf/locale/rtl/LC_MESSAGES/django.po
index bbfa9ac233d2..abba53851d77 100644
--- a/conf/locale/rtl/LC_MESSAGES/django.po
+++ b/conf/locale/rtl/LC_MESSAGES/django.po
@@ -38,8 +38,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.1a\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2023-10-08 20:36+0000\n"
-"PO-Revision-Date: 2023-10-08 20:36:26.861016\n"
+"POT-Creation-Date: 2023-10-22 20:35+0000\n"
+"PO-Revision-Date: 2023-10-22 20:35:52.246505\n"
 "Last-Translator: \n"
 "Language-Team: openedx-translation <openedx-translation@googlegroups.com>\n"
 "Language: rtl\n"
@@ -2027,68 +2027,6 @@ msgstr "Ŧɥǝ bɐdƃǝ ᴉɯɐƃǝ ɟᴉlǝ sᴉzǝ ɯnsʇ bǝ lǝss ʇɥɐn 25
 msgid "This value must be all lowercase."
 msgstr "Ŧɥᴉs ʌɐlnǝ ɯnsʇ bǝ ɐll løʍǝɹɔɐsǝ."
 
-#: lms/djangoapps/badges/models.py
-msgid "The course mode for this badge image. For example, \"verified\" or \"honor\"."
-msgstr "Ŧɥǝ ɔønɹsǝ ɯødǝ ɟøɹ ʇɥᴉs bɐdƃǝ ᴉɯɐƃǝ. Føɹ ǝxɐɯdlǝ, \"ʌǝɹᴉɟᴉǝd\" øɹ \"ɥønøɹ\"."
-
-#: lms/djangoapps/badges/models.py
-msgid ""
-"Badge images must be square PNG files. The file size should be under 250KB."
-msgstr ""
-"Ƀɐdƃǝ ᴉɯɐƃǝs ɯnsʇ bǝ sbnɐɹǝ ⱣNǤ ɟᴉlǝs. Ŧɥǝ ɟᴉlǝ sᴉzǝ sɥønld bǝ nndǝɹ 250ꝀɃ."
-
-#: lms/djangoapps/badges/models.py
-msgid ""
-"Set this value to True if you want this image to be the default image for "
-"any course modes that do not have a specified badge image. You can have only"
-" one default image."
-msgstr ""
-"Sǝʇ ʇɥᴉs ʌɐlnǝ ʇø Ŧɹnǝ ᴉɟ ʎøn ʍɐnʇ ʇɥᴉs ᴉɯɐƃǝ ʇø bǝ ʇɥǝ dǝɟɐnlʇ ᴉɯɐƃǝ ɟøɹ "
-"ɐnʎ ɔønɹsǝ ɯødǝs ʇɥɐʇ dø nøʇ ɥɐʌǝ ɐ sdǝɔᴉɟᴉǝd bɐdƃǝ ᴉɯɐƃǝ. Ɏøn ɔɐn ɥɐʌǝ ønlʎ"
-" ønǝ dǝɟɐnlʇ ᴉɯɐƃǝ."
-
-#: lms/djangoapps/badges/models.py
-msgid "There can be only one default image."
-msgstr "Ŧɥǝɹǝ ɔɐn bǝ ønlʎ ønǝ dǝɟɐnlʇ ᴉɯɐƃǝ."
-
-#: lms/djangoapps/badges/models.py
-msgid ""
-"On each line, put the number of completed courses to award a badge for, a "
-"comma, and the slug of a badge class you have created that has the issuing "
-"component 'openedx__course'. For example: 3,enrolled_3_courses"
-msgstr ""
-"Øn ǝɐɔɥ lᴉnǝ, dnʇ ʇɥǝ nnɯbǝɹ øɟ ɔøɯdlǝʇǝd ɔønɹsǝs ʇø ɐʍɐɹd ɐ bɐdƃǝ ɟøɹ, ɐ "
-"ɔøɯɯɐ, ɐnd ʇɥǝ slnƃ øɟ ɐ bɐdƃǝ ɔlɐss ʎøn ɥɐʌǝ ɔɹǝɐʇǝd ʇɥɐʇ ɥɐs ʇɥǝ ᴉssnᴉnƃ "
-"ɔøɯdønǝnʇ 'ødǝnǝdx__ɔønɹsǝ'. Føɹ ǝxɐɯdlǝ: 3,ǝnɹøllǝd_3_ɔønɹsǝs"
-
-#: lms/djangoapps/badges/models.py
-msgid ""
-"On each line, put the number of enrolled courses to award a badge for, a "
-"comma, and the slug of a badge class you have created that has the issuing "
-"component 'openedx__course'. For example: 3,enrolled_3_courses"
-msgstr ""
-"Øn ǝɐɔɥ lᴉnǝ, dnʇ ʇɥǝ nnɯbǝɹ øɟ ǝnɹøllǝd ɔønɹsǝs ʇø ɐʍɐɹd ɐ bɐdƃǝ ɟøɹ, ɐ "
-"ɔøɯɯɐ, ɐnd ʇɥǝ slnƃ øɟ ɐ bɐdƃǝ ɔlɐss ʎøn ɥɐʌǝ ɔɹǝɐʇǝd ʇɥɐʇ ɥɐs ʇɥǝ ᴉssnᴉnƃ "
-"ɔøɯdønǝnʇ 'ødǝnǝdx__ɔønɹsǝ'. Føɹ ǝxɐɯdlǝ: 3,ǝnɹøllǝd_3_ɔønɹsǝs"
-
-#: lms/djangoapps/badges/models.py
-msgid ""
-"Each line is a comma-separated list. The first item in each line is the slug"
-" of a badge class you have created that has an issuing component of "
-"'openedx__course'. The remaining items in each line are the course keys the "
-"learner needs to complete to be awarded the badge. For example: "
-"slug_for_compsci_courses_group_badge,course-v1:CompSci+Course+First,course-v1:CompsSci+Course+Second"
-msgstr ""
-"Ɇɐɔɥ lᴉnǝ ᴉs ɐ ɔøɯɯɐ-sǝdɐɹɐʇǝd lᴉsʇ. Ŧɥǝ ɟᴉɹsʇ ᴉʇǝɯ ᴉn ǝɐɔɥ lᴉnǝ ᴉs ʇɥǝ slnƃ"
-" øɟ ɐ bɐdƃǝ ɔlɐss ʎøn ɥɐʌǝ ɔɹǝɐʇǝd ʇɥɐʇ ɥɐs ɐn ᴉssnᴉnƃ ɔøɯdønǝnʇ øɟ "
-"'ødǝnǝdx__ɔønɹsǝ'. Ŧɥǝ ɹǝɯɐᴉnᴉnƃ ᴉʇǝɯs ᴉn ǝɐɔɥ lᴉnǝ ɐɹǝ ʇɥǝ ɔønɹsǝ ʞǝʎs ʇɥǝ "
-"lǝɐɹnǝɹ nǝǝds ʇø ɔøɯdlǝʇǝ ʇø bǝ ɐʍɐɹdǝd ʇɥǝ bɐdƃǝ. Føɹ ǝxɐɯdlǝ: "
-"slnƃ_ɟøɹ_ɔøɯdsɔᴉ_ɔønɹsǝs_ƃɹønd_bɐdƃǝ,ɔønɹsǝ-ʌ1:ȻøɯdSɔᴉ+Ȼønɹsǝ+Fᴉɹsʇ,ɔønɹsǝ-ʌ1:ȻøɯdsSɔᴉ+Ȼønɹsǝ+Sǝɔønd"
-
-#: lms/djangoapps/badges/models.py
-msgid "Please check the syntax of your entry."
-msgstr "Ᵽlǝɐsǝ ɔɥǝɔʞ ʇɥǝ sʎnʇɐx øɟ ʎønɹ ǝnʇɹʎ."
-
 #. Translators: This string is used across Open edX installations
 #. as a callback to edX. Please do not translate `edX.org`
 #: lms/djangoapps/branding/api.py
@@ -3595,12 +3533,12 @@ msgid "Good"
 msgstr "Ǥøød"
 
 #. Translators: Replier commented on "your" response to your post
-#: lms/djangoapps/discussion/rest_api/utils.py
+#: lms/djangoapps/discussion/rest_api/discussions_notifications.py
 msgid "your"
 msgstr "ʎønɹ"
 
 #. Translators: Replier commented on "their" response to your post
-#: lms/djangoapps/discussion/rest_api/utils.py
+#: lms/djangoapps/discussion/rest_api/discussions_notifications.py
 msgid "their"
 msgstr "ʇɥǝᴉɹ"
 
@@ -7546,6 +7484,24 @@ msgstr ""
 "<{p}><{strong}>{username}</{strong}> ɐsʞǝd "
 "<{strong}>{post_title}</{strong}></{p}>"
 
+#: openedx/core/djangoapps/notifications/base_notification.py
+#, python-brace-format
+msgid ""
+"<{p}><{strong}>{replier_name}</{strong}> responded to a post you’re "
+"following: <{strong}>{post_title}</{strong}></{p}>"
+msgstr ""
+"<{p}><{strong}>{replier_name}</{strong}> ɹǝsdøndǝd ʇø ɐ døsʇ ʎøn’ɹǝ "
+"ɟølløʍᴉnƃ: <{strong}>{post_title}</{strong}></{p}>"
+
+#: openedx/core/djangoapps/notifications/base_notification.py
+#, python-brace-format
+msgid ""
+"<{p}><{strong}>{replier_name}</{strong}> commented on {author_name}'s "
+"response in a post you’re following <{strong}>{post_title}</{strong}></{p}>"
+msgstr ""
+"<{p}><{strong}>{replier_name}</{strong}> ɔøɯɯǝnʇǝd øn {author_name}'s "
+"ɹǝsdønsǝ ᴉn ɐ døsʇ ʎøn’ɹǝ ɟølløʍᴉnƃ <{strong}>{post_title}</{strong}></{p}>"
+
 #: openedx/core/djangoapps/notifications/base_notification.py
 msgid ""
 "Notifications for responses and comments on your posts, and the ones you’re "
@@ -10770,18 +10726,6 @@ msgstr ""
 "Ɇdᴉʇ ʇɥǝ nɐɯǝ øɟ ʇɥǝ ʌᴉdǝø ʇɥnɯbnɐᴉl ᴉɯɐƃǝ ɟᴉlǝ. Ɏøn ɔɐn sǝʇ ʇɥǝ ʌᴉdǝø "
 "ʇɥnɯbnɐᴉl ᴉɯɐƃǝ øn ʇɥǝ Sǝʇʇᴉnƃs & Đǝʇɐᴉls dɐƃǝ."
 
-#: xmodule/course_block.py
-msgid "Issue Open Badges"
-msgstr "Ɨssnǝ Ødǝn Ƀɐdƃǝs"
-
-#: xmodule/course_block.py
-msgid ""
-"Issue Open Badges badges for this course. Badges are generated when "
-"certificates are created."
-msgstr ""
-"Ɨssnǝ Ødǝn Ƀɐdƃǝs bɐdƃǝs ɟøɹ ʇɥᴉs ɔønɹsǝ. Ƀɐdƃǝs ɐɹǝ ƃǝnǝɹɐʇǝd ʍɥǝn "
-"ɔǝɹʇᴉɟᴉɔɐʇǝs ɐɹǝ ɔɹǝɐʇǝd."
-
 #: xmodule/course_block.py
 msgid ""
 "Use this setting only when generating PDF certificates. Between quotation "
@@ -21035,8 +20979,8 @@ msgid "Studio Accessibility Policy"
 msgstr "Sʇndᴉø Ⱥɔɔǝssᴉbᴉlᴉʇʎ Ᵽølᴉɔʎ"
 
 #: cms/templates/asset_index.html cms/templates/widgets/header.html
-msgid "Files & Uploads"
-msgstr "Fᴉlǝs & Ʉdløɐds"
+msgid "Files"
+msgstr "Fᴉlǝs"
 
 #: cms/templates/certificates.html
 msgid "Course Certificates"
@@ -22967,6 +22911,10 @@ msgstr "Ⱥɹɔɥᴉʌǝd Ȼønɹsǝs"
 msgid "Libraries"
 msgstr "Łᴉbɹɐɹᴉǝs"
 
+#: cms/templates/index.html
+msgid "Taxonomies"
+msgstr "Ŧɐxønøɯᴉǝs"
+
 #: cms/templates/index.html
 msgid "Are you staff on an existing {studio_name} course?"
 msgstr "Ⱥɹǝ ʎøn sʇɐɟɟ øn ɐn ǝxᴉsʇᴉnƃ {studio_name} ɔønɹsǝ?"
diff --git a/conf/locale/rtl/LC_MESSAGES/djangojs.mo b/conf/locale/rtl/LC_MESSAGES/djangojs.mo
index 37deb82eb33e..e59d3dd99b24 100644
Binary files a/conf/locale/rtl/LC_MESSAGES/djangojs.mo and b/conf/locale/rtl/LC_MESSAGES/djangojs.mo differ
diff --git a/conf/locale/rtl/LC_MESSAGES/djangojs.po b/conf/locale/rtl/LC_MESSAGES/djangojs.po
index fbbc53b09dab..8955ec2b9db4 100644
--- a/conf/locale/rtl/LC_MESSAGES/djangojs.po
+++ b/conf/locale/rtl/LC_MESSAGES/djangojs.po
@@ -32,8 +32,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.1a\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2023-10-08 20:36+0000\n"
-"PO-Revision-Date: 2023-10-08 20:36:26.755103\n"
+"POT-Creation-Date: 2023-10-22 20:35+0000\n"
+"PO-Revision-Date: 2023-10-22 20:35:52.488124\n"
 "Last-Translator: \n"
 "Language-Team: openedx-translation <openedx-translation@googlegroups.com>\n"
 "Language: rtl\n"
@@ -132,7 +132,6 @@ msgstr "Ʉdløɐdᴉnƃ"
 #: cms/templates/js/course-video-settings.underscore
 #: common/static/common/templates/discussion/templates.underscore
 #: common/static/common/templates/image-modal.underscore
-#: openedx/features/learner_profile/static/learner_profile/templates/share_modal.underscore
 msgid "Close"
 msgstr "Ȼløsǝ"
 
@@ -4010,10 +4009,6 @@ msgstr ""
 "Ŧǝll øʇɥǝɹ lǝɐɹnǝɹs ɐ lᴉʇʇlǝ ɐbønʇ ʎønɹsǝlɟ: ʍɥǝɹǝ ʎøn lᴉʌǝ, ʍɥɐʇ ʎønɹ "
 "ᴉnʇǝɹǝsʇs ɐɹǝ, ʍɥʎ ʎøn'ɹǝ ʇɐʞᴉnƃ ɔønɹsǝs, øɹ ʍɥɐʇ ʎøn ɥødǝ ʇø lǝɐɹn."
 
-#: openedx/features/learner_profile/static/learner_profile/js/views/badge_list_container.js
-msgid "Accomplishments Pagination"
-msgstr "Ⱥɔɔøɯdlᴉsɥɯǝnʇs Ᵽɐƃᴉnɐʇᴉøn"
-
 #: openedx/features/learner_profile/static/learner_profile/js/views/learner_profile_fields.js
 msgid "Account Settings page."
 msgstr "Ⱥɔɔønnʇ Sǝʇʇᴉnƃs dɐƃǝ."
@@ -4046,10 +4041,6 @@ msgstr "Ᵽɹøɟᴉlǝ ᴉɯɐƃǝ ɟøɹ {username}"
 msgid "About Me"
 msgstr "Ⱥbønʇ Mǝ"
 
-#: openedx/features/learner_profile/static/learner_profile/js/views/learner_profile_view.js
-msgid "Accomplishments"
-msgstr "Ⱥɔɔøɯdlᴉsɥɯǝnʇs"
-
 #: openedx/features/learner_profile/static/learner_profile/js/views/learner_profile_view.js
 msgid "Profile"
 msgstr "Ᵽɹøɟᴉlǝ"
@@ -9848,32 +9839,6 @@ msgstr[1] "Łøɐd nǝxʇ {num_items} ɹǝsnlʇs"
 msgid "Sorry, no results were found."
 msgstr "Søɹɹʎ, nø ɹǝsnlʇs ʍǝɹǝ ɟønnd."
 
-#: openedx/features/learner_profile/static/learner_profile/templates/badge.underscore
-#, python-format
-msgid "Share your \"%(display_name)s\" award"
-msgstr "Sɥɐɹǝ ʎønɹ \"%(display_name)s\" ɐʍɐɹd"
-
-#: openedx/features/learner_profile/static/learner_profile/templates/badge.underscore
-msgid "Share"
-msgstr "Sɥɐɹǝ"
-
-#: openedx/features/learner_profile/static/learner_profile/templates/badge.underscore
-#, python-format
-msgid "Earned %(created)s."
-msgstr "Ɇɐɹnǝd %(created)s."
-
-#: openedx/features/learner_profile/static/learner_profile/templates/badge_placeholder.underscore
-msgid "What's Your Next Accomplishment?"
-msgstr "Wɥɐʇ's Ɏønɹ Nǝxʇ Ⱥɔɔøɯdlᴉsɥɯǝnʇ?"
-
-#: openedx/features/learner_profile/static/learner_profile/templates/badge_placeholder.underscore
-msgid "Start working toward your next learning goal."
-msgstr "Sʇɐɹʇ ʍøɹʞᴉnƃ ʇøʍɐɹd ʎønɹ nǝxʇ lǝɐɹnᴉnƃ ƃøɐl."
-
-#: openedx/features/learner_profile/static/learner_profile/templates/badge_placeholder.underscore
-msgid "Find a course"
-msgstr "Fᴉnd ɐ ɔønɹsǝ"
-
 #: openedx/features/learner_profile/static/learner_profile/templates/section_two.underscore
 msgid "You are currently sharing a limited profile."
 msgstr "Ɏøn ɐɹǝ ɔnɹɹǝnʇlʎ sɥɐɹᴉnƃ ɐ lᴉɯᴉʇǝd dɹøɟᴉlǝ."
@@ -9882,38 +9847,6 @@ msgstr "Ɏøn ɐɹǝ ɔnɹɹǝnʇlʎ sɥɐɹᴉnƃ ɐ lᴉɯᴉʇǝd dɹøɟᴉl
 msgid "This learner is currently sharing a limited profile."
 msgstr "Ŧɥᴉs lǝɐɹnǝɹ ᴉs ɔnɹɹǝnʇlʎ sɥɐɹᴉnƃ ɐ lᴉɯᴉʇǝd dɹøɟᴉlǝ."
 
-#: openedx/features/learner_profile/static/learner_profile/templates/share_modal.underscore
-msgid "Share on Mozilla Backpack"
-msgstr "Sɥɐɹǝ øn Møzᴉllɐ Ƀɐɔʞdɐɔʞ"
-
-#: openedx/features/learner_profile/static/learner_profile/templates/share_modal.underscore
-msgid ""
-"To share your certificate on Mozilla Backpack, you must first have a "
-"Backpack account. Complete the following steps to add your certificate to "
-"Backpack."
-msgstr ""
-"Ŧø sɥɐɹǝ ʎønɹ ɔǝɹʇᴉɟᴉɔɐʇǝ øn Møzᴉllɐ Ƀɐɔʞdɐɔʞ, ʎøn ɯnsʇ ɟᴉɹsʇ ɥɐʌǝ ɐ "
-"Ƀɐɔʞdɐɔʞ ɐɔɔønnʇ. Ȼøɯdlǝʇǝ ʇɥǝ ɟølløʍᴉnƃ sʇǝds ʇø ɐdd ʎønɹ ɔǝɹʇᴉɟᴉɔɐʇǝ ʇø "
-"Ƀɐɔʞdɐɔʞ."
-
-#: openedx/features/learner_profile/static/learner_profile/templates/share_modal.underscore
-msgid ""
-"Create a {link_start}Mozilla Backpack{link_end} account, or log in to your "
-"existing account"
-msgstr ""
-"Ȼɹǝɐʇǝ ɐ {link_start}Møzᴉllɐ Ƀɐɔʞdɐɔʞ{link_end} ɐɔɔønnʇ, øɹ løƃ ᴉn ʇø ʎønɹ "
-"ǝxᴉsʇᴉnƃ ɐɔɔønnʇ"
-
-#: openedx/features/learner_profile/static/learner_profile/templates/share_modal.underscore
-msgid ""
-"{download_link_start}Download this image (right-click or option-click, save "
-"as){link_end} and then {upload_link_start}upload{link_end} it to your "
-"backpack."
-msgstr ""
-"{download_link_start}Đøʍnløɐd ʇɥᴉs ᴉɯɐƃǝ (ɹᴉƃɥʇ-ɔlᴉɔʞ øɹ ødʇᴉøn-ɔlᴉɔʞ, sɐʌǝ "
-"ɐs){link_end} ɐnd ʇɥǝn {upload_link_start}ndløɐd{link_end} ᴉʇ ʇø ʎønɹ "
-"bɐɔʞdɐɔʞ."
-
 #: cms/templates/js/access-editor.underscore
 msgid "Limit Access"
 msgstr "Łᴉɯᴉʇ Ⱥɔɔǝss"
diff --git a/conf/locale/ru/LC_MESSAGES/django.po b/conf/locale/ru/LC_MESSAGES/django.po
index c14da1dafc82..6d2ab4968c83 100644
--- a/conf/locale/ru/LC_MESSAGES/django.po
+++ b/conf/locale/ru/LC_MESSAGES/django.po
@@ -20296,10 +20296,6 @@ msgstr ""
 "Ознакомьтесь с недавно запущенными курсами и новостями по вашим любимым "
 "предметам."
 
-#: themes/edx.org/lms/templates/dashboard.html
-msgid "Take advantage of free coaching!"
-msgstr ""
-
 #: themes/edx.org/lms/templates/dashboard.html
 msgid "Get Started"
 msgstr ""
diff --git a/conf/locale/ru/LC_MESSAGES/djangojs.po b/conf/locale/ru/LC_MESSAGES/djangojs.po
index 57e9096fc573..38aa24dafeda 100644
--- a/conf/locale/ru/LC_MESSAGES/djangojs.po
+++ b/conf/locale/ru/LC_MESSAGES/djangojs.po
@@ -193,7 +193,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: edx-platform\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2023-09-17 20:42+0000\n"
+"POT-Creation-Date: 2023-10-08 20:42+0000\n"
 "PO-Revision-Date: 2014-06-11 15:18+0000\n"
 "Last-Translator: ashed <craysy@gmail.com>, 2022-2023\n"
 "Language-Team: Russian (http://app.transifex.com/open-edx/edx-platform/language/ru/)\n"
diff --git a/conf/locale/sk/LC_MESSAGES/django.po b/conf/locale/sk/LC_MESSAGES/django.po
index b89b1f04ed25..b628d93dde08 100644
--- a/conf/locale/sk/LC_MESSAGES/django.po
+++ b/conf/locale/sk/LC_MESSAGES/django.po
@@ -55,7 +55,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.1a\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2023-09-17 20:43+0000\n"
+"POT-Creation-Date: 2023-10-08 20:43+0000\n"
 "PO-Revision-Date: 2019-01-20 20:43+0000\n"
 "Last-Translator: Waheed Ahmed <waheed@edx.org>, 2019\n"
 "Language-Team: Slovak (https://app.transifex.com/open-edx/teams/6205/sk/)\n"
@@ -3300,12 +3300,12 @@ msgid "Good"
 msgstr ""
 
 #. Translators: Replier commented on "your" response to your post
-#: lms/djangoapps/discussion/rest_api/utils.py
+#: lms/djangoapps/discussion/rest_api/discussions_notifications.py
 msgid "your"
 msgstr ""
 
 #. Translators: Replier commented on "their" response to your post
-#: lms/djangoapps/discussion/rest_api/utils.py
+#: lms/djangoapps/discussion/rest_api/discussions_notifications.py
 msgid "their"
 msgstr ""
 
@@ -6890,6 +6890,20 @@ msgid ""
 "<{strong}>{post_title}</{strong}></{p}>"
 msgstr ""
 
+#: openedx/core/djangoapps/notifications/base_notification.py
+#, python-brace-format
+msgid ""
+"<{p}><{strong}>{replier_name}</{strong}> responded to a post you’re "
+"following: <{strong}>{post_title}</{strong}></{p}>"
+msgstr ""
+
+#: openedx/core/djangoapps/notifications/base_notification.py
+#, python-brace-format
+msgid ""
+"<{p}><{strong}>{replier_name}</{strong}> commented on {author_name}'s "
+"response in a post you’re following <{strong}>{post_title}</{strong}></{p}>"
+msgstr ""
+
 #: openedx/core/djangoapps/notifications/base_notification.py
 msgid ""
 "Notifications for responses and comments on your posts, and the ones you’re "
diff --git a/conf/locale/sk/LC_MESSAGES/djangojs.po b/conf/locale/sk/LC_MESSAGES/djangojs.po
index 1e707b179ada..30ad50119f43 100644
--- a/conf/locale/sk/LC_MESSAGES/djangojs.po
+++ b/conf/locale/sk/LC_MESSAGES/djangojs.po
@@ -46,7 +46,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: edx-platform\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2023-09-17 20:42+0000\n"
+"POT-Creation-Date: 2023-10-08 20:42+0000\n"
 "PO-Revision-Date: 2014-06-11 15:18+0000\n"
 "Last-Translator: \n"
 "Language-Team: Slovak (http://app.transifex.com/open-edx/edx-platform/language/sk/)\n"
diff --git a/conf/locale/sw_KE/LC_MESSAGES/django.po b/conf/locale/sw_KE/LC_MESSAGES/django.po
index 2dab56fb0aa9..ee60f36c44ad 100644
--- a/conf/locale/sw_KE/LC_MESSAGES/django.po
+++ b/conf/locale/sw_KE/LC_MESSAGES/django.po
@@ -85,7 +85,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.1a\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2023-09-17 20:43+0000\n"
+"POT-Creation-Date: 2023-10-08 20:43+0000\n"
 "PO-Revision-Date: 2019-01-20 20:43+0000\n"
 "Last-Translator: Waheed Ahmed <waheed@edx.org>, 2019\n"
 "Language-Team: Swahili (Kenya) (https://app.transifex.com/open-edx/teams/6205/sw_KE/)\n"
@@ -3337,12 +3337,12 @@ msgid "Good"
 msgstr "Vizuri"
 
 #. Translators: Replier commented on "your" response to your post
-#: lms/djangoapps/discussion/rest_api/utils.py
+#: lms/djangoapps/discussion/rest_api/discussions_notifications.py
 msgid "your"
 msgstr ""
 
 #. Translators: Replier commented on "their" response to your post
-#: lms/djangoapps/discussion/rest_api/utils.py
+#: lms/djangoapps/discussion/rest_api/discussions_notifications.py
 msgid "their"
 msgstr ""
 
@@ -6934,6 +6934,20 @@ msgid ""
 "<{strong}>{post_title}</{strong}></{p}>"
 msgstr ""
 
+#: openedx/core/djangoapps/notifications/base_notification.py
+#, python-brace-format
+msgid ""
+"<{p}><{strong}>{replier_name}</{strong}> responded to a post you’re "
+"following: <{strong}>{post_title}</{strong}></{p}>"
+msgstr ""
+
+#: openedx/core/djangoapps/notifications/base_notification.py
+#, python-brace-format
+msgid ""
+"<{p}><{strong}>{replier_name}</{strong}> commented on {author_name}'s "
+"response in a post you’re following <{strong}>{post_title}</{strong}></{p}>"
+msgstr ""
+
 #: openedx/core/djangoapps/notifications/base_notification.py
 msgid ""
 "Notifications for responses and comments on your posts, and the ones you’re "
diff --git a/conf/locale/sw_KE/LC_MESSAGES/djangojs.po b/conf/locale/sw_KE/LC_MESSAGES/djangojs.po
index 52e1dcbeea93..21be4a28b605 100644
--- a/conf/locale/sw_KE/LC_MESSAGES/djangojs.po
+++ b/conf/locale/sw_KE/LC_MESSAGES/djangojs.po
@@ -71,7 +71,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: edx-platform\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2023-09-17 20:42+0000\n"
+"POT-Creation-Date: 2023-10-08 20:42+0000\n"
 "PO-Revision-Date: 2014-06-11 15:18+0000\n"
 "Last-Translator: YAHAYA MWAVURIZI <translations_1@camara.ie>, 2017\n"
 "Language-Team: Swahili (Kenya) (http://app.transifex.com/open-edx/edx-platform/language/sw_KE/)\n"
diff --git a/conf/locale/th/LC_MESSAGES/django.po b/conf/locale/th/LC_MESSAGES/django.po
index 5375e0555163..d1d3abd2909c 100644
--- a/conf/locale/th/LC_MESSAGES/django.po
+++ b/conf/locale/th/LC_MESSAGES/django.po
@@ -116,7 +116,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.1a\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2023-09-17 20:43+0000\n"
+"POT-Creation-Date: 2023-10-08 20:43+0000\n"
 "PO-Revision-Date: 2019-01-20 20:43+0000\n"
 "Last-Translator: Waheed Ahmed <waheed@edx.org>, 2019\n"
 "Language-Team: Thai (https://app.transifex.com/open-edx/teams/6205/th/)\n"
@@ -3226,12 +3226,12 @@ msgid "Good"
 msgstr ""
 
 #. Translators: Replier commented on "your" response to your post
-#: lms/djangoapps/discussion/rest_api/utils.py
+#: lms/djangoapps/discussion/rest_api/discussions_notifications.py
 msgid "your"
 msgstr ""
 
 #. Translators: Replier commented on "their" response to your post
-#: lms/djangoapps/discussion/rest_api/utils.py
+#: lms/djangoapps/discussion/rest_api/discussions_notifications.py
 msgid "their"
 msgstr ""
 
@@ -6749,6 +6749,20 @@ msgid ""
 "<{strong}>{post_title}</{strong}></{p}>"
 msgstr ""
 
+#: openedx/core/djangoapps/notifications/base_notification.py
+#, python-brace-format
+msgid ""
+"<{p}><{strong}>{replier_name}</{strong}> responded to a post you’re "
+"following: <{strong}>{post_title}</{strong}></{p}>"
+msgstr ""
+
+#: openedx/core/djangoapps/notifications/base_notification.py
+#, python-brace-format
+msgid ""
+"<{p}><{strong}>{replier_name}</{strong}> commented on {author_name}'s "
+"response in a post you’re following <{strong}>{post_title}</{strong}></{p}>"
+msgstr ""
+
 #: openedx/core/djangoapps/notifications/base_notification.py
 msgid ""
 "Notifications for responses and comments on your posts, and the ones you’re "
diff --git a/conf/locale/th/LC_MESSAGES/djangojs.po b/conf/locale/th/LC_MESSAGES/djangojs.po
index 727ea417a2bb..3c103e1416c5 100644
--- a/conf/locale/th/LC_MESSAGES/djangojs.po
+++ b/conf/locale/th/LC_MESSAGES/djangojs.po
@@ -73,7 +73,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: edx-platform\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2023-09-17 20:42+0000\n"
+"POT-Creation-Date: 2023-10-08 20:42+0000\n"
 "PO-Revision-Date: 2014-06-11 15:18+0000\n"
 "Last-Translator: edx demo <edx.one2clouds@gmail.com>, 2019\n"
 "Language-Team: Thai (http://app.transifex.com/open-edx/edx-platform/language/th/)\n"
diff --git a/conf/locale/tr_TR/LC_MESSAGES/django.po b/conf/locale/tr_TR/LC_MESSAGES/django.po
index db6be8862445..8d02cfb30af9 100644
--- a/conf/locale/tr_TR/LC_MESSAGES/django.po
+++ b/conf/locale/tr_TR/LC_MESSAGES/django.po
@@ -3708,12 +3708,12 @@ msgid "Good"
 msgstr "İyi"
 
 #. Translators: Replier commented on "your" response to your post
-#: lms/djangoapps/discussion/rest_api/utils.py
+#: lms/djangoapps/discussion/rest_api/discussions_notifications.py
 msgid "your"
 msgstr "size"
 
 #. Translators: Replier commented on "their" response to your post
-#: lms/djangoapps/discussion/rest_api/utils.py
+#: lms/djangoapps/discussion/rest_api/discussions_notifications.py
 msgid "their"
 msgstr "onlara"
 
@@ -7689,6 +7689,20 @@ msgstr ""
 "<{p}><{strong}>{username}</{strong}> sordu "
 "<{strong}>{post_title}</{strong}></{p}>"
 
+#: openedx/core/djangoapps/notifications/base_notification.py
+#, python-brace-format
+msgid ""
+"<{p}><{strong}>{replier_name}</{strong}> responded to a post you’re "
+"following: <{strong}>{post_title}</{strong}></{p}>"
+msgstr ""
+
+#: openedx/core/djangoapps/notifications/base_notification.py
+#, python-brace-format
+msgid ""
+"<{p}><{strong}>{replier_name}</{strong}> commented on {author_name}'s "
+"response in a post you’re following <{strong}>{post_title}</{strong}></{p}>"
+msgstr ""
+
 #: openedx/core/djangoapps/notifications/base_notification.py
 msgid ""
 "Notifications for responses and comments on your posts, and the ones you’re "
diff --git a/conf/locale/tr_TR/LC_MESSAGES/djangojs.po b/conf/locale/tr_TR/LC_MESSAGES/djangojs.po
index b8e157cc2b4f..e7898c12221c 100644
--- a/conf/locale/tr_TR/LC_MESSAGES/djangojs.po
+++ b/conf/locale/tr_TR/LC_MESSAGES/djangojs.po
@@ -110,7 +110,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: edx-platform\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2023-09-17 20:42+0000\n"
+"POT-Creation-Date: 2023-10-08 20:42+0000\n"
 "PO-Revision-Date: 2014-06-11 15:18+0000\n"
 "Last-Translator: Ali Işıngör <ali@artistanbul.io>, 2018,2020-2021,2023\n"
 "Language-Team: Turkish (Turkey) (http://app.transifex.com/open-edx/edx-platform/language/tr_TR/)\n"
diff --git a/conf/locale/uk/LC_MESSAGES/django.po b/conf/locale/uk/LC_MESSAGES/django.po
index 55d45117c64d..3bcc098c5dd4 100644
--- a/conf/locale/uk/LC_MESSAGES/django.po
+++ b/conf/locale/uk/LC_MESSAGES/django.po
@@ -18,6 +18,7 @@
 # IvanPrimachenko <jastudent1@gmail.com>, 2014
 # Martin Horst <horst.mr@gmail.com>, 2018
 # Mykhailo Parfeniuk <sopyer@gmail.com>, 2016
+# Mykola Melnyk, 2023
 # Natalia Vynogradenko <tannaha@gmail.com>, 2017-2018
 # Nikolai Belochub, 2014
 # cc322e8fc6cc292f0f00d8b7420e7410_e468d09 <95dee59251c2de5d1d21e213a66df19d_243275>, 2014
@@ -125,7 +126,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.1a\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2023-09-17 20:43+0000\n"
+"POT-Creation-Date: 2023-10-08 20:43+0000\n"
 "PO-Revision-Date: 2019-01-20 20:43+0000\n"
 "Last-Translator: Danylo Shcherbak <danylo.shcherbak@raccoongang.com>, 2020\n"
 "Language-Team: Ukrainian (https://app.transifex.com/open-edx/teams/6205/uk/)\n"
@@ -3572,12 +3573,12 @@ msgid "Good"
 msgstr "Добре"
 
 #. Translators: Replier commented on "your" response to your post
-#: lms/djangoapps/discussion/rest_api/utils.py
+#: lms/djangoapps/discussion/rest_api/discussions_notifications.py
 msgid "your"
 msgstr ""
 
 #. Translators: Replier commented on "their" response to your post
-#: lms/djangoapps/discussion/rest_api/utils.py
+#: lms/djangoapps/discussion/rest_api/discussions_notifications.py
 msgid "their"
 msgstr ""
 
@@ -7383,6 +7384,20 @@ msgid ""
 "<{strong}>{post_title}</{strong}></{p}>"
 msgstr ""
 
+#: openedx/core/djangoapps/notifications/base_notification.py
+#, python-brace-format
+msgid ""
+"<{p}><{strong}>{replier_name}</{strong}> responded to a post you’re "
+"following: <{strong}>{post_title}</{strong}></{p}>"
+msgstr ""
+
+#: openedx/core/djangoapps/notifications/base_notification.py
+#, python-brace-format
+msgid ""
+"<{p}><{strong}>{replier_name}</{strong}> commented on {author_name}'s "
+"response in a post you’re following <{strong}>{post_title}</{strong}></{p}>"
+msgstr ""
+
 #: openedx/core/djangoapps/notifications/base_notification.py
 msgid ""
 "Notifications for responses and comments on your posts, and the ones you’re "
diff --git a/conf/locale/uk/LC_MESSAGES/djangojs.po b/conf/locale/uk/LC_MESSAGES/djangojs.po
index de9cd2e85d9a..bfadf2ecc635 100644
--- a/conf/locale/uk/LC_MESSAGES/djangojs.po
+++ b/conf/locale/uk/LC_MESSAGES/djangojs.po
@@ -102,7 +102,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: edx-platform\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2023-09-17 20:42+0000\n"
+"POT-Creation-Date: 2023-10-08 20:42+0000\n"
 "PO-Revision-Date: 2014-06-11 15:18+0000\n"
 "Last-Translator: Andrey Kryachko, 2018\n"
 "Language-Team: Ukrainian (http://app.transifex.com/open-edx/edx-platform/language/uk/)\n"
diff --git a/conf/locale/vi/LC_MESSAGES/django.po b/conf/locale/vi/LC_MESSAGES/django.po
index 49e88138f288..ffd88f10303d 100644
--- a/conf/locale/vi/LC_MESSAGES/django.po
+++ b/conf/locale/vi/LC_MESSAGES/django.po
@@ -198,7 +198,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.1a\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2023-09-17 20:43+0000\n"
+"POT-Creation-Date: 2023-10-08 20:43+0000\n"
 "PO-Revision-Date: 2019-01-20 20:43+0000\n"
 "Last-Translator: Le Minh Tri <trilm@hihexa.com>, 2020\n"
 "Language-Team: Vietnamese (https://app.transifex.com/open-edx/teams/6205/vi/)\n"
@@ -3300,12 +3300,12 @@ msgid "Good"
 msgstr ""
 
 #. Translators: Replier commented on "your" response to your post
-#: lms/djangoapps/discussion/rest_api/utils.py
+#: lms/djangoapps/discussion/rest_api/discussions_notifications.py
 msgid "your"
 msgstr ""
 
 #. Translators: Replier commented on "their" response to your post
-#: lms/djangoapps/discussion/rest_api/utils.py
+#: lms/djangoapps/discussion/rest_api/discussions_notifications.py
 msgid "their"
 msgstr ""
 
@@ -6827,6 +6827,20 @@ msgid ""
 "<{strong}>{post_title}</{strong}></{p}>"
 msgstr ""
 
+#: openedx/core/djangoapps/notifications/base_notification.py
+#, python-brace-format
+msgid ""
+"<{p}><{strong}>{replier_name}</{strong}> responded to a post you’re "
+"following: <{strong}>{post_title}</{strong}></{p}>"
+msgstr ""
+
+#: openedx/core/djangoapps/notifications/base_notification.py
+#, python-brace-format
+msgid ""
+"<{p}><{strong}>{replier_name}</{strong}> commented on {author_name}'s "
+"response in a post you’re following <{strong}>{post_title}</{strong}></{p}>"
+msgstr ""
+
 #: openedx/core/djangoapps/notifications/base_notification.py
 msgid ""
 "Notifications for responses and comments on your posts, and the ones you’re "
diff --git a/conf/locale/vi/LC_MESSAGES/djangojs.po b/conf/locale/vi/LC_MESSAGES/djangojs.po
index 468215f6fdca..64fdeb1dd0f2 100644
--- a/conf/locale/vi/LC_MESSAGES/djangojs.po
+++ b/conf/locale/vi/LC_MESSAGES/djangojs.po
@@ -113,7 +113,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: edx-platform\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2023-09-17 20:42+0000\n"
+"POT-Creation-Date: 2023-10-08 20:42+0000\n"
 "PO-Revision-Date: 2014-06-11 15:18+0000\n"
 "Last-Translator: Le Minh Tri <trilm@hihexa.com>, 2020\n"
 "Language-Team: Vietnamese (http://app.transifex.com/open-edx/edx-platform/language/vi/)\n"
diff --git a/conf/locale/zh_CN/LC_MESSAGES/django.mo b/conf/locale/zh_CN/LC_MESSAGES/django.mo
index 52436b2f380a..9dd98ee07524 100644
Binary files a/conf/locale/zh_CN/LC_MESSAGES/django.mo and b/conf/locale/zh_CN/LC_MESSAGES/django.mo differ
diff --git a/conf/locale/zh_CN/LC_MESSAGES/django.po b/conf/locale/zh_CN/LC_MESSAGES/django.po
index 7530c6fd048a..8829d9b568db 100644
--- a/conf/locale/zh_CN/LC_MESSAGES/django.po
+++ b/conf/locale/zh_CN/LC_MESSAGES/django.po
@@ -403,7 +403,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.1a\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2023-09-17 20:43+0000\n"
+"POT-Creation-Date: 2023-10-08 20:43+0000\n"
 "PO-Revision-Date: 2019-01-20 20:43+0000\n"
 "Last-Translator: ifLab <webmaster@iflab.org>, 2019\n"
 "Language-Team: Chinese (China) (https://app.transifex.com/open-edx/teams/6205/zh_CN/)\n"
@@ -525,13 +525,13 @@ msgstr "空白"
 #: cms/djangoapps/contentstore/xblock_storage_handlers/view_handlers.py
 #: openedx/core/djangoapps/xblock/rest_api/views.py
 msgid "Invalid data"
-msgstr ""
+msgstr "无效的数据"
 
 #: cms/djangoapps/contentstore/xblock_storage_handlers/view_handlers.py
 #: openedx/core/djangoapps/xblock/rest_api/views.py
 #, python-brace-format
 msgid "Invalid data ({details})"
-msgstr ""
+msgstr "无效的数据 ({details})"
 
 #: cms/templates/admin/base_site.html lms/templates/admin/base_site.html
 msgid "Django site admin"
@@ -3629,12 +3629,12 @@ msgid "Good"
 msgstr "好"
 
 #. Translators: Replier commented on "your" response to your post
-#: lms/djangoapps/discussion/rest_api/utils.py
+#: lms/djangoapps/discussion/rest_api/discussions_notifications.py
 msgid "your"
 msgstr ""
 
 #. Translators: Replier commented on "their" response to your post
-#: lms/djangoapps/discussion/rest_api/utils.py
+#: lms/djangoapps/discussion/rest_api/discussions_notifications.py
 msgid "their"
 msgstr ""
 
@@ -6797,6 +6797,7 @@ msgstr ""
 msgid "Original usage key/ID of the thing that is in the clipboard."
 msgstr ""
 
+#: openedx/core/djangoapps/content_tagging/models/base.py
 #: wiki/models/article.py
 msgid "owner"
 msgstr "所有者"
@@ -7278,6 +7279,20 @@ msgid ""
 "<{strong}>{post_title}</{strong}></{p}>"
 msgstr ""
 
+#: openedx/core/djangoapps/notifications/base_notification.py
+#, python-brace-format
+msgid ""
+"<{p}><{strong}>{replier_name}</{strong}> responded to a post you’re "
+"following: <{strong}>{post_title}</{strong}></{p}>"
+msgstr ""
+
+#: openedx/core/djangoapps/notifications/base_notification.py
+#, python-brace-format
+msgid ""
+"<{p}><{strong}>{replier_name}</{strong}> commented on {author_name}'s "
+"response in a post you’re following <{strong}>{post_title}</{strong}></{p}>"
+msgstr ""
+
 #: openedx/core/djangoapps/notifications/base_notification.py
 msgid ""
 "Notifications for responses and comments on your posts, and the ones you’re "
@@ -11959,19 +11974,19 @@ msgstr "课程团队用户不存在"
 #, python-brace-format
 msgid ""
 "Number of course outline regenerations successfully requested: {regenerates}"
-msgstr ""
+msgstr "成功请求的课程大纲重新生成数：{regenerates}"
 
 #: cms/djangoapps/contentstore/admin.py
 msgid "Regenerate selected course outlines"
-msgstr ""
+msgstr "重新生成选定的课程大纲"
 
 #: cms/djangoapps/contentstore/admin.py
 msgid "All course outline regenerations successfully requested."
-msgstr ""
+msgstr "已成功请求所有课程大纲重新生成。"
 
 #: cms/djangoapps/contentstore/admin.py
 msgid "Regenerate *all* course outlines"
-msgstr ""
+msgstr "重新生成*所有*课程大纲"
 
 #: cms/djangoapps/contentstore/asset_storage_handlers.py
 msgid "Upload completed"
@@ -12033,11 +12048,11 @@ msgstr "(未命名)"
 
 #: cms/djangoapps/contentstore/errors.py
 msgid "Aborting import because a course with this id: {} already exists."
-msgstr ""
+msgstr "正在中止导入，因为具有此 ID 的课程：{} 已经存在。"
 
 #: cms/djangoapps/contentstore/errors.py
 msgid "Permission denied. You do not have write access to this course."
-msgstr ""
+msgstr "您没有对此课程的写入权限。"
 
 #: cms/djangoapps/contentstore/errors.py
 #, python-brace-format
@@ -12046,7 +12061,7 @@ msgstr "无法在包中找到{0}文件。"
 
 #: cms/djangoapps/contentstore/errors.py
 msgid "Uploaded Tar file not found. Try again."
-msgstr ""
+msgstr "找不到上传文件。再试一次。"
 
 #: cms/djangoapps/contentstore/errors.py
 #: cms/djangoapps/contentstore/views/import_export.py
@@ -12055,11 +12070,11 @@ msgstr "我们仅支持上传.tar.gz格式文件。"
 
 #: cms/djangoapps/contentstore/errors.py
 msgid "Aborting import since a library with this id already exists."
-msgstr ""
+msgstr "中止导入，因为具有此id的文件已存在。"
 
 #: cms/djangoapps/contentstore/errors.py
 msgid "Course olx validation failed. Please check your email."
-msgstr ""
+msgstr "课程验证失败。请查看你的邮箱。"
 
 #: cms/djangoapps/contentstore/errors.py
 msgid "Permission denied"
@@ -12067,11 +12082,11 @@ msgstr "没有权限"
 
 #: cms/djangoapps/contentstore/errors.py
 msgid "Unknown error while importing course."
-msgstr ""
+msgstr "导入课程时出现未知错误。"
 
 #: cms/djangoapps/contentstore/errors.py
 msgid "An Unknown error occurred during the unpacking step."
-msgstr ""
+msgstr "解压包过程中发生未知错误。"
 
 #: cms/djangoapps/contentstore/errors.py
 #, python-brace-format
@@ -12099,6 +12114,7 @@ msgid ""
 "Non writable git url provided. Expecting something like: "
 "git@github.com:openedx/openedx-demo-course.git"
 msgstr ""
+"提供的GIT URL地址不正确。正确内容比如如下：git@github.com:openedx/openedx-demo-course.git"
 
 #: cms/djangoapps/contentstore/git_export_utils.py
 msgid ""
@@ -12166,39 +12182,39 @@ msgstr ""
 
 #: cms/djangoapps/contentstore/rest_api/v0/serializers/advanced_settings.py
 msgid "Marks a field as deprecated."
-msgstr ""
+msgstr "标记的字段已弃用。"
 
 #: cms/djangoapps/contentstore/rest_api/v0/serializers/advanced_settings.py
 msgid "User-friendly display name for the field"
-msgstr ""
+msgstr "该用户名的字段显示"
 
 #: cms/djangoapps/contentstore/rest_api/v0/serializers/advanced_settings.py
 msgid "Help text that describes the setting."
-msgstr ""
+msgstr "描述设置的帮助文本。"
 
 #: cms/djangoapps/contentstore/rest_api/v0/serializers/tabs.py
 msgid "Tab type"
-msgstr ""
+msgstr "标签类型"
 
 #: cms/djangoapps/contentstore/rest_api/v0/serializers/tabs.py
 msgid "Default name for the tab displayed to users"
-msgstr ""
+msgstr "向用户显示的选项卡的默认名称"
 
 #: cms/djangoapps/contentstore/rest_api/v0/serializers/tabs.py
 msgid "True if it's possible to hide the tab for a course"
-msgstr ""
+msgstr "此课程可能设置隐藏"
 
 #: cms/djangoapps/contentstore/rest_api/v0/serializers/tabs.py
 msgid "True the tab is hidden for the course"
-msgstr ""
+msgstr "课程设置为隐藏"
 
 #: cms/djangoapps/contentstore/rest_api/v0/serializers/tabs.py
 msgid "True if it's possible to reorder the tab in the list of tabs"
-msgstr ""
+msgstr "可在选项卡列表中可能设置重新排序选项卡，"
 
 #: cms/djangoapps/contentstore/rest_api/v0/serializers/tabs.py
 msgid "True if this tab should be displayed only for instructors"
-msgstr ""
+msgstr "此选项卡只应为教师"
 
 #: cms/djangoapps/contentstore/rest_api/v0/serializers/tabs.py
 msgid "Name of the tab displayed to users. Overrides title."
diff --git a/conf/locale/zh_CN/LC_MESSAGES/djangojs.po b/conf/locale/zh_CN/LC_MESSAGES/djangojs.po
index 88327c771fef..843d2345e13d 100644
--- a/conf/locale/zh_CN/LC_MESSAGES/djangojs.po
+++ b/conf/locale/zh_CN/LC_MESSAGES/djangojs.po
@@ -230,7 +230,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: edx-platform\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2023-09-17 20:42+0000\n"
+"POT-Creation-Date: 2023-10-08 20:42+0000\n"
 "PO-Revision-Date: 2014-06-11 15:18+0000\n"
 "Last-Translator: jsgang <jsgang9@gmail.com>, 2015-2017,2020\n"
 "Language-Team: Chinese (China) (http://app.transifex.com/open-edx/edx-platform/language/zh_CN/)\n"
diff --git a/conf/locale/zh_HANS/LC_MESSAGES/django.mo b/conf/locale/zh_HANS/LC_MESSAGES/django.mo
index 52436b2f380a..9dd98ee07524 100644
Binary files a/conf/locale/zh_HANS/LC_MESSAGES/django.mo and b/conf/locale/zh_HANS/LC_MESSAGES/django.mo differ
diff --git a/conf/locale/zh_HANS/LC_MESSAGES/django.po b/conf/locale/zh_HANS/LC_MESSAGES/django.po
index 7530c6fd048a..8829d9b568db 100644
--- a/conf/locale/zh_HANS/LC_MESSAGES/django.po
+++ b/conf/locale/zh_HANS/LC_MESSAGES/django.po
@@ -403,7 +403,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.1a\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2023-09-17 20:43+0000\n"
+"POT-Creation-Date: 2023-10-08 20:43+0000\n"
 "PO-Revision-Date: 2019-01-20 20:43+0000\n"
 "Last-Translator: ifLab <webmaster@iflab.org>, 2019\n"
 "Language-Team: Chinese (China) (https://app.transifex.com/open-edx/teams/6205/zh_CN/)\n"
@@ -525,13 +525,13 @@ msgstr "空白"
 #: cms/djangoapps/contentstore/xblock_storage_handlers/view_handlers.py
 #: openedx/core/djangoapps/xblock/rest_api/views.py
 msgid "Invalid data"
-msgstr ""
+msgstr "无效的数据"
 
 #: cms/djangoapps/contentstore/xblock_storage_handlers/view_handlers.py
 #: openedx/core/djangoapps/xblock/rest_api/views.py
 #, python-brace-format
 msgid "Invalid data ({details})"
-msgstr ""
+msgstr "无效的数据 ({details})"
 
 #: cms/templates/admin/base_site.html lms/templates/admin/base_site.html
 msgid "Django site admin"
@@ -3629,12 +3629,12 @@ msgid "Good"
 msgstr "好"
 
 #. Translators: Replier commented on "your" response to your post
-#: lms/djangoapps/discussion/rest_api/utils.py
+#: lms/djangoapps/discussion/rest_api/discussions_notifications.py
 msgid "your"
 msgstr ""
 
 #. Translators: Replier commented on "their" response to your post
-#: lms/djangoapps/discussion/rest_api/utils.py
+#: lms/djangoapps/discussion/rest_api/discussions_notifications.py
 msgid "their"
 msgstr ""
 
@@ -6797,6 +6797,7 @@ msgstr ""
 msgid "Original usage key/ID of the thing that is in the clipboard."
 msgstr ""
 
+#: openedx/core/djangoapps/content_tagging/models/base.py
 #: wiki/models/article.py
 msgid "owner"
 msgstr "所有者"
@@ -7278,6 +7279,20 @@ msgid ""
 "<{strong}>{post_title}</{strong}></{p}>"
 msgstr ""
 
+#: openedx/core/djangoapps/notifications/base_notification.py
+#, python-brace-format
+msgid ""
+"<{p}><{strong}>{replier_name}</{strong}> responded to a post you’re "
+"following: <{strong}>{post_title}</{strong}></{p}>"
+msgstr ""
+
+#: openedx/core/djangoapps/notifications/base_notification.py
+#, python-brace-format
+msgid ""
+"<{p}><{strong}>{replier_name}</{strong}> commented on {author_name}'s "
+"response in a post you’re following <{strong}>{post_title}</{strong}></{p}>"
+msgstr ""
+
 #: openedx/core/djangoapps/notifications/base_notification.py
 msgid ""
 "Notifications for responses and comments on your posts, and the ones you’re "
@@ -11959,19 +11974,19 @@ msgstr "课程团队用户不存在"
 #, python-brace-format
 msgid ""
 "Number of course outline regenerations successfully requested: {regenerates}"
-msgstr ""
+msgstr "成功请求的课程大纲重新生成数：{regenerates}"
 
 #: cms/djangoapps/contentstore/admin.py
 msgid "Regenerate selected course outlines"
-msgstr ""
+msgstr "重新生成选定的课程大纲"
 
 #: cms/djangoapps/contentstore/admin.py
 msgid "All course outline regenerations successfully requested."
-msgstr ""
+msgstr "已成功请求所有课程大纲重新生成。"
 
 #: cms/djangoapps/contentstore/admin.py
 msgid "Regenerate *all* course outlines"
-msgstr ""
+msgstr "重新生成*所有*课程大纲"
 
 #: cms/djangoapps/contentstore/asset_storage_handlers.py
 msgid "Upload completed"
@@ -12033,11 +12048,11 @@ msgstr "(未命名)"
 
 #: cms/djangoapps/contentstore/errors.py
 msgid "Aborting import because a course with this id: {} already exists."
-msgstr ""
+msgstr "正在中止导入，因为具有此 ID 的课程：{} 已经存在。"
 
 #: cms/djangoapps/contentstore/errors.py
 msgid "Permission denied. You do not have write access to this course."
-msgstr ""
+msgstr "您没有对此课程的写入权限。"
 
 #: cms/djangoapps/contentstore/errors.py
 #, python-brace-format
@@ -12046,7 +12061,7 @@ msgstr "无法在包中找到{0}文件。"
 
 #: cms/djangoapps/contentstore/errors.py
 msgid "Uploaded Tar file not found. Try again."
-msgstr ""
+msgstr "找不到上传文件。再试一次。"
 
 #: cms/djangoapps/contentstore/errors.py
 #: cms/djangoapps/contentstore/views/import_export.py
@@ -12055,11 +12070,11 @@ msgstr "我们仅支持上传.tar.gz格式文件。"
 
 #: cms/djangoapps/contentstore/errors.py
 msgid "Aborting import since a library with this id already exists."
-msgstr ""
+msgstr "中止导入，因为具有此id的文件已存在。"
 
 #: cms/djangoapps/contentstore/errors.py
 msgid "Course olx validation failed. Please check your email."
-msgstr ""
+msgstr "课程验证失败。请查看你的邮箱。"
 
 #: cms/djangoapps/contentstore/errors.py
 msgid "Permission denied"
@@ -12067,11 +12082,11 @@ msgstr "没有权限"
 
 #: cms/djangoapps/contentstore/errors.py
 msgid "Unknown error while importing course."
-msgstr ""
+msgstr "导入课程时出现未知错误。"
 
 #: cms/djangoapps/contentstore/errors.py
 msgid "An Unknown error occurred during the unpacking step."
-msgstr ""
+msgstr "解压包过程中发生未知错误。"
 
 #: cms/djangoapps/contentstore/errors.py
 #, python-brace-format
@@ -12099,6 +12114,7 @@ msgid ""
 "Non writable git url provided. Expecting something like: "
 "git@github.com:openedx/openedx-demo-course.git"
 msgstr ""
+"提供的GIT URL地址不正确。正确内容比如如下：git@github.com:openedx/openedx-demo-course.git"
 
 #: cms/djangoapps/contentstore/git_export_utils.py
 msgid ""
@@ -12166,39 +12182,39 @@ msgstr ""
 
 #: cms/djangoapps/contentstore/rest_api/v0/serializers/advanced_settings.py
 msgid "Marks a field as deprecated."
-msgstr ""
+msgstr "标记的字段已弃用。"
 
 #: cms/djangoapps/contentstore/rest_api/v0/serializers/advanced_settings.py
 msgid "User-friendly display name for the field"
-msgstr ""
+msgstr "该用户名的字段显示"
 
 #: cms/djangoapps/contentstore/rest_api/v0/serializers/advanced_settings.py
 msgid "Help text that describes the setting."
-msgstr ""
+msgstr "描述设置的帮助文本。"
 
 #: cms/djangoapps/contentstore/rest_api/v0/serializers/tabs.py
 msgid "Tab type"
-msgstr ""
+msgstr "标签类型"
 
 #: cms/djangoapps/contentstore/rest_api/v0/serializers/tabs.py
 msgid "Default name for the tab displayed to users"
-msgstr ""
+msgstr "向用户显示的选项卡的默认名称"
 
 #: cms/djangoapps/contentstore/rest_api/v0/serializers/tabs.py
 msgid "True if it's possible to hide the tab for a course"
-msgstr ""
+msgstr "此课程可能设置隐藏"
 
 #: cms/djangoapps/contentstore/rest_api/v0/serializers/tabs.py
 msgid "True the tab is hidden for the course"
-msgstr ""
+msgstr "课程设置为隐藏"
 
 #: cms/djangoapps/contentstore/rest_api/v0/serializers/tabs.py
 msgid "True if it's possible to reorder the tab in the list of tabs"
-msgstr ""
+msgstr "可在选项卡列表中可能设置重新排序选项卡，"
 
 #: cms/djangoapps/contentstore/rest_api/v0/serializers/tabs.py
 msgid "True if this tab should be displayed only for instructors"
-msgstr ""
+msgstr "此选项卡只应为教师"
 
 #: cms/djangoapps/contentstore/rest_api/v0/serializers/tabs.py
 msgid "Name of the tab displayed to users. Overrides title."
diff --git a/conf/locale/zh_HANS/LC_MESSAGES/djangojs.po b/conf/locale/zh_HANS/LC_MESSAGES/djangojs.po
index 88327c771fef..843d2345e13d 100644
--- a/conf/locale/zh_HANS/LC_MESSAGES/djangojs.po
+++ b/conf/locale/zh_HANS/LC_MESSAGES/djangojs.po
@@ -230,7 +230,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: edx-platform\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2023-09-17 20:42+0000\n"
+"POT-Creation-Date: 2023-10-08 20:42+0000\n"
 "PO-Revision-Date: 2014-06-11 15:18+0000\n"
 "Last-Translator: jsgang <jsgang9@gmail.com>, 2015-2017,2020\n"
 "Language-Team: Chinese (China) (http://app.transifex.com/open-edx/edx-platform/language/zh_CN/)\n"
diff --git a/conf/locale/zh_TW/LC_MESSAGES/django.po b/conf/locale/zh_TW/LC_MESSAGES/django.po
index 8c9c7f706e39..40972435e7b6 100644
--- a/conf/locale/zh_TW/LC_MESSAGES/django.po
+++ b/conf/locale/zh_TW/LC_MESSAGES/django.po
@@ -177,7 +177,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.1a\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2023-09-17 20:43+0000\n"
+"POT-Creation-Date: 2023-10-08 20:43+0000\n"
 "PO-Revision-Date: 2019-01-20 20:43+0000\n"
 "Last-Translator: Waheed Ahmed <waheed@edx.org>, 2019\n"
 "Language-Team: Chinese (Taiwan) (https://app.transifex.com/open-edx/teams/6205/zh_TW/)\n"
@@ -3341,12 +3341,12 @@ msgid "Good"
 msgstr "好"
 
 #. Translators: Replier commented on "your" response to your post
-#: lms/djangoapps/discussion/rest_api/utils.py
+#: lms/djangoapps/discussion/rest_api/discussions_notifications.py
 msgid "your"
 msgstr ""
 
 #. Translators: Replier commented on "their" response to your post
-#: lms/djangoapps/discussion/rest_api/utils.py
+#: lms/djangoapps/discussion/rest_api/discussions_notifications.py
 msgid "their"
 msgstr ""
 
@@ -6915,6 +6915,20 @@ msgid ""
 "<{strong}>{post_title}</{strong}></{p}>"
 msgstr ""
 
+#: openedx/core/djangoapps/notifications/base_notification.py
+#, python-brace-format
+msgid ""
+"<{p}><{strong}>{replier_name}</{strong}> responded to a post you’re "
+"following: <{strong}>{post_title}</{strong}></{p}>"
+msgstr ""
+
+#: openedx/core/djangoapps/notifications/base_notification.py
+#, python-brace-format
+msgid ""
+"<{p}><{strong}>{replier_name}</{strong}> commented on {author_name}'s "
+"response in a post you’re following <{strong}>{post_title}</{strong}></{p}>"
+msgstr ""
+
 #: openedx/core/djangoapps/notifications/base_notification.py
 msgid ""
 "Notifications for responses and comments on your posts, and the ones you’re "
diff --git a/conf/locale/zh_TW/LC_MESSAGES/djangojs.po b/conf/locale/zh_TW/LC_MESSAGES/djangojs.po
index 15d153824aef..91dd729e0909 100644
--- a/conf/locale/zh_TW/LC_MESSAGES/djangojs.po
+++ b/conf/locale/zh_TW/LC_MESSAGES/djangojs.po
@@ -132,7 +132,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: edx-platform\n"
 "Report-Msgid-Bugs-To: openedx-translation@googlegroups.com\n"
-"POT-Creation-Date: 2023-09-17 20:42+0000\n"
+"POT-Creation-Date: 2023-10-08 20:42+0000\n"
 "PO-Revision-Date: 2014-06-11 15:18+0000\n"
 "Last-Translator: Andrew Lau <alau52@yahoo.com>, 2017\n"
 "Language-Team: Chinese (Taiwan) (http://app.transifex.com/open-edx/edx-platform/language/zh_TW/)\n"
diff --git a/docs/concepts/testing/testing.rst b/docs/concepts/testing/testing.rst
index 1297b0ee3b5a..9d448afd5bdc 100644
--- a/docs/concepts/testing/testing.rst
+++ b/docs/concepts/testing/testing.rst
@@ -114,10 +114,16 @@ For example, this command runs a single python unit test file::
     pytest xmodule/tests/test_stringify.py
 
 Note -
-edx-platorm has multiple services (lms, cms) in it. The environment for each service is different enough that we run some tests in both environments in jenkins. To make sure tests will pass in each of these environments (especially for tests in "common" directory), you will need to test in each seperately. Add --rootdir flag at end of your pytest call and specify the env you are testing in::
+edx-platorm has multiple services (lms, cms) in it. The environment for each service is different enough that we run some tests in both environments in Github Actions. 
+To test in each of these environments (especially for tests in "common" and "xmodule" directories), you will need to test in each seperately.
+To specify that the tests are run with the relevant service as root, Add --rootdir flag at end of your pytest call and specify the env to test in::
 
     pytest test --rootdir <lms or cms>
 
+Or, if you need django settings from a particular enviroment, add --ds flag to the end of your pytest call and specify the django settings object::
+
+    pytest test --ds=<lms.envs.test or cms.envs.test>
+
 Various tools like ddt create tests with very complex names, rather than figuring out the name yourself, you can:
 
 1. Select tests to run based on their name, provide an expression to the `pytest -k option`_ which performs a substring match on test names::
diff --git a/docs/decisions/0004-managing-django-settings.rst b/docs/decisions/0004-managing-django-settings.rst
index 97c15b6cf4b5..6da93a76163e 100644
--- a/docs/decisions/0004-managing-django-settings.rst
+++ b/docs/decisions/0004-managing-django-settings.rst
@@ -59,7 +59,6 @@ and for all environments to use __init__.py to load their settings.
 The following files should be obviated by this change:
 
 * bok_choy_docker.py
-* bok_choy.py
 * devstack_docker.py
 * devstack_optimized.py
 * devstack.py
diff --git a/docs/decisions/0018-standarize-django-po-files.rst b/docs/decisions/0018-standarize-django-po-files.rst
new file mode 100644
index 000000000000..4020b7c493e9
--- /dev/null
+++ b/docs/decisions/0018-standarize-django-po-files.rst
@@ -0,0 +1,155 @@
+Standardize ``django.po`` and ``djangojs.po`` files
+===================================================
+
+Status
+------
+
+Accepted
+
+Context
+-------
+
+- The edx-platform splits its translations into ``mako-studio.po``,
+  ``django-partial.po``, and 9 other files.  This was done with the
+  intention of supporting more languages in the LMS than in
+  the CMS (Studio).
+
+- The edx-platform uses the ``i18n_tools segment`` to split the ``django.po``
+  and ``djangojs.po`` files into smaller files. This is done with the goal of
+  making it easier for translators to translate the files.
+
+- When pulling from Transifex or cutting a new release, the translations are
+  bundled into 2 files (``django.po`` and ``djangojs.po``).
+
+- The `FC-0012 project <https://openedx.atlassian.net/l/cp/XGS0iCcQ>`_
+  which implements `Translation Infrastructure update OEP-58`_
+  is in progress. Upon completion, all translation files will live in
+  the new `openedx-translations Transifex project`_.
+
+- Consequently, repositories like ``edx-platform`` will pull translations via
+  `openedx-atlas`_ command line tool as described in the `OEP-58`_ proposal.
+
+- Several special steps would be needed to for the
+  `extract-translation-source-files.yml`_ GitHub workflow in
+  the `openedx-translations GitHub repository`_
+  to extract the files from the ``edx-platform`` repo.
+  This seems redundant and and it should be possible to simplify the process.
+
+Decision: Only use two files for edx-platform translations (``django.po`` and ``djangojs.po``)
+----------------------------------------------------------------------------------------------
+
+edX Platform will push only two files (``django.po`` and
+``djangojs.``) to the `openedx-translations Transifex project`_.
+
+Consequences
+------------
+
+Pros:
+
+- Translators will need to locate only two resources for the ``edx-platform``
+  repo as opposed to 11 resources.
+- Simplify the ``edx-platform`` translation extraction scripts in the
+  `extract-translation-source-files.yml`_ GitHub workflow.
+- The release cut process will be simplified as well by removing the
+  translation merger step altogether.
+- Translators will need one workflow for both latest (master) and named
+  releases for the ``edx-platform`` repo.
+- Simplifies the work of both the Build Test Release and Transifex working groups.
+
+Cons:
+
+- It will be harder for translators to focus on learner-facing text and de-prioritize
+  educator-facing text.
+
+
+Rejected Alternatives
+---------------------
+
+Combine into four files
+^^^^^^^^^^^^^^^^^^^^^^^
+
+This option tries to keep the original idea of splitting to allow translators
+to focus on learner-facing text and de-prioritize educator-facing text.
+
+The four files will be ``platform.po``, ``platform-js.po``, ``studio.po``
+and ``studio-js.po``.
+
+It will not concern the translators with the technical split
+of the files into: ``wiki.po``, ``mako.po``, and ``django-partial.po``, etc.
+
+
+In this option we'll create two new configuration files
+``config.extract-oep58.yaml`` and ``config.pull-oep58.yaml`` to combine the
+pofiles into the four files and then combine them into two files respectively:
+
+.. code:: yaml
+
+    # config.extract-oep58.yaml
+    # This file is used by the ``make extract_translations`` when
+    # the OPENEDX_COMBINE_FILES environment variable is enabled.
+    generate_merge:
+        platform.po:
+            - django-partial.po
+            - mako.po
+            - wiki.po
+            - edx_proctoring_proctortrack.po
+        platform-js.po:
+            - djangojs-partial.po
+            - djangojs-account-settings-view.po
+            - underscore.po
+        studio.po:
+            - django-studio.po
+            - mako-studio.po
+        studio-js.po:
+            - djangojs-studio.po
+            - underscore-studio.po
+
+A corresponding ``Makefile`` change is needed:
+
+.. code:: make
+
+    extract_translations: ## extract localizable strings from sources
+        i18n_tool extract -v
+        if [ -z "$$OPENEDX_COMBINE_FILES" ]; then \
+            i18n_tool generate --config=config.extract-oep58.yaml --verbose 1;
+        fi
+
+The other file would be ran after ``make pull_translations`` which will
+be used to make the final ``django.po`` and ``djangojs.po`` files that are
+usable by Django:
+
+.. code:: yaml
+
+    # config.pull-oep58.yaml
+    # This file is used by the ``make pull_translations`` when
+    # the OPENEDX_ATLAS_PULL environment variable is enabled.
+    generate_merge:
+        django.po:
+            - platform.po
+            - studio.po
+        djangojs.po:
+            - platform-js.po
+            - studio-js.po
+
+
+    pull_translations: ## extract localizable strings from sources
+        if [ -z "$$OPENEDX_ATLAS_PULL" ]; then \
+            atlas pull translations/edx-platform/conf/locale
+            i18n_tool --config=config.pull-oep58.yaml generate --verbose 1;
+        fi
+
+
+This option involves multiple merge and split steps which adds complexity
+for developers. Based on the `feedback in the decision pull request`_,
+splitting the resources was a lesser used feature in the Open edX community.
+Therefore, this option is rejected because the added complexity of this
+option isn't justified.
+
+
+.. _extract-translation-source-files.yml: https://github.com/openedx/openedx-translations/blob/2566e0c9a30d033e5dd8d05d4c12601c8e37b4ef/.github/workflows/extract-translation-source-files.yml
+.. _openedx-translations GitHub repository: https://github.com/openedx/openedx-translations
+.. _openedx-translations Transifex project: https://app.transifex.com/open-edx/openedx-translations/
+.. _OEP-58: https://open-edx-proposals.readthedocs.io/en/latest/architectural-decisions/oep-0058-arch-translations-management.html#specification
+.. _openedx-atlas: https://github.com/openedx/openedx-atlas/
+.. _Translation Infrastructure update OEP-58: https://open-edx-proposals.readthedocs.io/en/latest/architectural-decisions/oep-0058-arch-translations-management.html#specification
+.. _feedback in the decision pull request: https://github.com/openedx/edx-platform/pull/32994#issuecomment-1677390405
diff --git a/docs/decisions/0019-oep-58-atlas-translations-design.rst b/docs/decisions/0019-oep-58-atlas-translations-design.rst
new file mode 100644
index 000000000000..1b7f573e2303
--- /dev/null
+++ b/docs/decisions/0019-oep-58-atlas-translations-design.rst
@@ -0,0 +1,362 @@
+Design for Refactoring Translations ``pull`` to use Atlas
+##########################################################
+
+Status
+======
+
+Accepted
+
+Context
+=======
+
+OEP-58 Translation Management overview
+--------------------------------------
+
+The `Translation Management update OEP-58`_ proposal has been merged with
+the following changes to the way translations are managed in the Open edX platform:
+
+- Move Translation Files to the `openedx-translations repo`_
+- Add the `Transifex GitHub App <https://github.com/apps/transifex-integration>`_
+  to openedx Organization
+- Connect the `openedx-translations repo`_ to the
+  `openedx-translations Transifex project`_
+- Copy `Transifex Translation Memory`_ into from the both of the
+  `edx-platform Transifex project`_ and the `xblocks Transifex project`_ into
+  the new `openedx-translations Transifex project`_
+- Utilize `openedx-atlas`_ to pull translations for development/deployment.
+
+If you're new to the `OEP-58`_ proposal, please
+review the `OEP-58 Specifications`_ in addition to the
+Key Metrics and Expected Results section in the
+`Approach Memo and Technical Discovery - Translations Infrastructure Implementation`_
+document before continuing.
+
+Pre-OEP-58 Architecture/Implementation for XBlocks and Plugins
+--------------------------------------------------------------
+
+Before `OEP-58`_, Open edX XBlocks and Open edX plugins had the following:
+
+- Translations live in the GitHub repository.
+- Translations are packaged with the rest of the code when published to pypi
+
+Pros:
+
+- Translations are always available after installation.
+
+Cons:
+
+- This can mean a complex integration with Transifex
+- This can mean a lengthy manual PR review process up to a month such as in
+  the following example:
+  `Added French (Canada) and Japanese - xblock-drag-and-drop-v2 #220`_
+
+XBlockI18nService
+-----------------
+
+The `XBlockI18nService`_ loads translations for installed XBlocks via its
+``__init__`` method. XBlock translations are only used during the
+during the execution of the XBlock.
+
+The `XBlockI18nService implementation pull request`_ (2016) introduced
+support for XBlock translations in ``edx-platform`` and has the full
+context of the implementation.
+
+.. _js-translations:
+
+JavaScript Translations for XBocks
+----------------------------------
+
+As of September 2023, there is no centralized method to bundle JavaScript
+translations in XBlocks. Non-XBlock plugins lack JavaScript translation
+support altogether.
+
+The de-facto standard method for bundling JavaScript translations in XBlocks
+is to use ``web_fragment`` and load the translations as part of the XBlock
+frontend static files on every XBlock load.
+
+The LTI Consumer XBlock embeds the translations in its ``web_fragment`` via
+the `LtiConsumerXBlock._get_statici18n_js_url`_ and
+`LtiConsumerXBlock.student_view`_ methods.
+
+In order to separate the XBlock translations from the platform, it's isolated
+in a separate ``gettext`` namespace. For example, the Drag and Drop XBlock
+namespace is ``DragAndDropI18N`` which is hardcoded in multiple places such
+as:
+
+- `XBlock Makefile compile_translations rule`_
+- `XBlock compiled JavaScript text.js translations`_
+- `XBlock main JavaScript file`_
+
+`OEP-58`_ does not change this structure, it just makes the necessary changes
+to pull translations from the `openedx-translations repo`_ via ``atlas``
+instead of having them live in the XBlock repository itself.
+
+Decisions
+=========
+
+Proposed Design for edX Platform ``conf/locale`` translations
+-------------------------------------------------------------
+
+We're going to use ``atlas`` in ``make pull_translations`` like we do in
+`course-discovery atlas integration`_ and
+`frontend-app-learning atlas integration`_.
+
+Proposed Design for XBlocks and Plugins
+---------------------------------------
+
+Instead of storing translation files for each XBlock and Plugin in their
+respective repositories,
+we will use `openedx-atlas`_ to pull them from the
+`openedx-translations repo`_.
+
+
+New ``atlas_pull_plugin_translations`` command
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+Introduce new Django commands to the ``edx-platform``:
+
+- ``manage.py lms atlas_pull_plugin_translations --list``: List all XBlocks and
+  Plugins installed in the ``edx-platform`` virtual environment. This will
+  list the Python *module names* (as opposed to git repository names) of the
+  installed XBlocks and Plugins e.g.::
+
+    $ manage.py lms atlas_pull_plugin_translations --list
+    drag_and_drop_v2
+    done
+    eox_tenant
+
+  This list doesn't include plugins that are bundled within the
+  ``edx-platform`` repository itself. Translations for bundled plugins
+  are included in the ``edx-platform`` translation files.
+
+- ``manage.py lms atlas_pull_plugin_translations``: This command
+  will pull translations for installed XBlocks and Plugins by module name::
+
+    $ atlas pull --expand-glob \
+        'translations/*/drag_and_drop_v2/conf/locale:conf/plugins-locale/drag_and_drop_v2' \
+        'translations/*/done/conf/locale:conf/plugins-locale/done' \
+        'translations/*/edx_proctoring/conf/locale:conf/plugins-locale/edx_proctoring'
+
+  Resulting in the following file tree::
+
+    $ tree conf/plugins-locale/
+    conf/plugins-locale/
+    ├── done
+    │   ├── ar
+    │   │   └── LC_MESSAGES
+    │   │       └── django.po
+    │   ├── de
+    │   │   └── LC_MESSAGES
+    │   │       └── django.po
+    │   ├── en
+    │   │   └── LC_MESSAGES
+    │   │       └── django.po
+    │   └── fr_CA
+    │       └── LC_MESSAGES
+    │           └── django.po
+    ├── drag_and_drop_v2
+    │   ├── ar
+    │   │   └── LC_MESSAGES
+    │   │       └── django.po
+    │   ├── en
+    │   │   └── LC_MESSAGES
+    │   │       └── django.po
+    │   └── fr_CA
+    │       └── LC_MESSAGES
+    │           └── django.po
+    └── edx_proctoring
+        ├── ar
+        │   └── LC_MESSAGES
+        │       └── djangojs.po
+        ├── de
+        │   └── LC_MESSAGES
+        │       └── djangojs.po
+        ├── en
+        │   └── LC_MESSAGES
+        │       ├── djangojs.po
+        │       └── django.po
+        └── fr_CA
+            └── LC_MESSAGES
+                ├── djangojs.po
+                └── django.po
+
+
+BlockI18nService support for ``atlas`` Python translations
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+``get_python_locale_directory`` will support two modes:
+
+#. If translations for the XBlock/plugin has been pulled by ``atlas``
+   from the `openedx-translations repo`_, it will be used. For example, if the
+   ``edx-platform/conf/plugins-locale/drag_and_drop_v2/ar/LC_MESSAGES/django.po``
+   path exists, it will be used for the Drag and Drop XBlock.
+
+#. Otherwise, the bundled translation files in the XBlock packages will be
+   used. The fallback path for the Drag and Drop XBlock will be
+   ``lib/python3.8/site-packages/drag_and_drop_v2/translations/ar/LC_MESSAGES/text.po``.
+
+This fallback is used to maintain backwards compatibility with existing
+XBlocks that may or may not be included in the `openedx-translations repo`_.
+Third-party XBlocks that are not included in the
+`xblocks Transifex project`_, such as the `Lime Survey XBlock`_,
+will benefit from this backwards compatibility.
+
+New ``compile_plugin_js_translations`` command
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+An ``XBlock.i18n_js_namespace`` property will be added for
+the ``compile_plugin_js_translations`` to generate JavaScript translations
+in a centrally managed manner for installed XBlocks.
+
+A ``compile_plugin_js_translations`` command will loop over XBlock
+modules that has the ``i18n_js_namespace``
+property set and compile the JavaScript translations via the `compilejsi18n`_
+command.
+
+For example if the Drag and Drop XBlock has
+``i18n_js_namespace = 'DragAndDropI18N'``, the
+``compile_plugin_js_translations`` command will execute the following
+commands::
+
+  i18n_tool generate -v  # Generate the .mo files
+  python manage.py compilejsi18n --namespace DragAndDropI18N --output conf/plugins-locale/drag_and_drop_v2/js/
+
+
+XBlockI18nService support for ``atlas`` JavaScript translations
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+A ``get_javascript_locale_path`` method will be added to the
+``XBlockI18nService`` to provide XBlocks the
+appropriate path to ``django.js`` translation files. This method
+will allow XBlocks to utilize legacy packaged translations
+or ``atlas``.
+
+A ``i18n_js_namespace`` property will be added
+to generate JavaScript translations in a centrally managed manner for all
+XBlocks as described in the :ref:`js-translations` section.
+
+For example, the `Drag and Drop XBlock get_static_i18n_js_url`_ will need to
+be updated to support the new ``XBlockI18nService``
+``get_javascript_locale_path`` method and the namespace.
+
+.. code:: diff
+
+     class DragAndDropBlock(XBlock):
+
+   +   i18n_js_namespace = 'DragAndDropI18N'
+
+       @staticmethod
+       def _get_statici18n_js_url():
+           """
+           Returns the Javascript translation file for the currently selected language, if any found by
+           `pkg_resources`
+           """
+           lang_code = translation.get_language()
+           if not lang_code:
+               return None
+
+   +       # TODO: Make this the default once OEP-58 is implemented.
+   +       if hasattr(self.i18n_service, 'get_javascript_locale_path'):
+   +           atlas_locale_path = self.i18n_service.get_javascript_locale_path()
+   +           if atlas_locale_path:
+   +               return atlas_locale_path
+
+           text_js = 'public/js/translations/{lang_code}/text.js'
+           country_code = lang_code.split('-')[0]
+           for code in (translation.to_locale(lang_code), lang_code, country_code):
+               if pkg_resources.resource_exists(loader.module_name, text_js.format(lang_code=code)):
+                   return text_js.format(lang_code=code)
+           return None
+
+
+Dismissed Proposals
+===================
+
+XBlocks and plugins have their own "atlas pull" command
+-------------------------------------------------------
+
+This dismissed proposal intends to have each XBlock and Plugin have their
+own ``make pull_translations`` and be responsible for managing pulling their
+own translations from the `openedx-translations repo`_.
+
+This proposal has been dismissed because it would require substantial work
+to get into the details for the ``lib/python3.8/site-packages/`` directory
+and ensure that the ``make pull_translations`` command won't corrupt the
+virtual environment.
+
+This is a non-trivial task and appears to add more complexity than necessary
+due to the fact that XBlocks and plugins won't be used outside the
+context of ``edx-platform``.
+
+
+Goals
+=====
+#. Use ``atlas pull`` for the ``edx-platform`` repo.
+#. Use ``atlas pull`` for the XBlocks and Plugins.
+#. Allow Tutor and other advanced uses to craft their own ``atlas pull``
+   commands by making the the plugins list available via Django commands.
+#. Allow ``atlas pull`` to use the Python module names instead of the
+   repository name of XBlocks and Plugins which is supported via the
+   `atlas pull --expand-glob`_ option.
+
+.. _non-goals:
+
+Non-Goals
+=========
+
+The following are non-goals for this proposal, although some are going to
+be tackled in the future as part of the
+`Translation Management update OEP-58`_ proposal.
+
+#. Provide a fool-proof method for managing named-release translations.
+   This will be a separate discussion.
+#. Discuss the merge/segment strategy of the ``edx-platform``. This is being
+   discussed in the
+   `decision no. 0018 <https://github.com/openedx/edx-platform/pull/32994>`_.
+#. Design a new XBlock frontend architecture. Instead this proposal works
+   with the existing architecture.
+#. Provide a new translation method for theme translations. This will be
+   tackled later on.
+#. Provide a new translation method for non-XBlock plugins such as
+   ``edx-val``. This will be tackled later on as part of the `OEP-58`_
+   proposal.
+
+.. _OEP-58 Specifications: https://open-edx-proposals.readthedocs.io/en/latest/architectural-decisions/oep-0058-arch-translations-management.html#specification
+.. _Translation Management update OEP-58: https://open-edx-proposals.readthedocs.io/en/latest/architectural-decisions/oep-0058-arch-translations-management.html#specification
+.. _OEP-58: https://open-edx-proposals.readthedocs.io/en/latest/architectural-decisions/oep-0058-arch-translations-management.html#specification
+.. _openedx-atlas: https://github.com/openedx/openedx-atlas
+.. _openedx-translations repo: https://github.com/openedx/openedx-translations
+.. _extract-translation-source-files.yml: https://github.com/openedx/openedx-translations/blob/2566e0c9a30d033e5dd8d05d4c12601c8e37b4ef/.github/workflows/extract-translation-source-files.yml#L36-L43
+.. _openedx-translations Transifex project: https://app.transifex.com/open-edx/openedx-translations/dashboard/
+
+.. _Approach Memo and Technical Discovery - Translations Infrastructure Implementation: https://docs.google.com/document/d/11dFBCnbdHiCEdZp3pZeHdeH8m7Glla-XbIin7cnIOzU/edit
+.. _Added French (Canada) and Japanese - xblock-drag-and-drop-v2 #220: https://github.com/openedx/xblock-drag-and-drop-v2/pull/220
+.. _XBlockI18nService: https://github.com/openedx/edx-platform/blob/6e28ba329e0a5354d7264ea834861bf0cae4ceb3/xmodule/modulestore/django.py#L359-L395
+.. _XBlockI18nService implementation pull request: https://github.com/openedx/edx-platform/pull/11575/files#diff-0bbcc6c13d9bfc9d88fbe2fdf4fd97f6066a7a0f0bfffb82bc942378b7cf33e0R248
+
+.. _course-discovery atlas integration: https://github.com/openedx/course-discovery/pull/4037
+.. _frontend-app-learning atlas integration: https://github.com/openedx/frontend-app-learning/pull/1093
+.. _edx-platform pull_translations: https://github.com/openedx/edx-platform/blob/0137881b8199701b2af7d07c9a01200e358e3d86/Makefile#L55-L64
+
+.. _drag-and-drop-v2 xblock: https://github.com/openedx/xblock-drag-and-drop-v2/
+.. _LTI Consumer XBlock: https://github.com/openedx/xblock-lti-consumer/
+.. _edx-val: https://github.com/openedx/edx-val
+
+.. _LtiConsumerXBlock._get_statici18n_js_url: https://github.com/openedx/xblock-lti-consumer/blob/7a142310a78ac393286c1e9e77c535ea520ab90b/lti_consumer/lti_xblock.py#L663-L677
+.. _LtiConsumerXBlock.student_view: https://github.com/openedx/xblock-lti-consumer/blob/7a142310a78ac393286c1e9e77c535ea520ab90b/lti_consumer/lti_xblock.py#L1215C24-L1217
+.. _Drag and Drop XBlock get_static_i18n_js_url: https://github.com/openedx/xblock-drag-and-drop-v2/blob/66e8d3517fe8c0db55c1a3907ff253c2a4562a7e/drag_and_drop_v2/drag_and_drop_v2.py#L318-L332
+
+.. _XBlock compiled JavaScript text.js translations: https://github.com/openedx/xblock-drag-and-drop-v2/blob/b8ab1ecd9168ab1dba21f994ee4bfedb6a57d11f/drag_and_drop_v2/public/js/translations/tr/text.js#L3
+.. _XBlock Makefile compile_translations rule: https://github.com/openedx/xblock-drag-and-drop-v2/blob/66e8d3517fe8c0db55c1a3907ff253c2a4562a7e/Makefile#L41
+.. _XBlock main JavaScript file: https://github.com/openedx/xblock-drag-and-drop-v2/blob/b8ab1ecd9168ab1dba21f994ee4bfedb6a57d11f/drag_and_drop_v2/public/js/drag_and_drop.js#L6
+
+
+.. _translations/xblock-drag-and-drop-v2 directory: https://github.com/openedx/openedx-translations/tree/8a01424fd8f42e9e76aed34e235c82ab654cdfc5/translations/xblock-drag-and-drop-v2
+.. _atlas pull --expand-glob: https://github.com/openedx/openedx-atlas/blob/main/docs/decisions/0001-support-glob-pattern.rst
+
+.. _compilejsi18n: https://django-statici18n.readthedocs.io/en/latest/commands.html#compilejsi18n
+.. _Transifex Translation Memory: https://help.transifex.com/en/articles/6224636-introduction-to-translation-memory
+.. _edx-platform Transifex project: https://www.transifex.com/open-edx/edx-platform/
+.. _xblocks Transifex project: https://www.transifex.com/open-edx/xblocks/
+
+.. _Lime Survey XBlock: https://github.com/eduNEXT/xblock-limesurvey
diff --git a/docs/lms-openapi.yaml b/docs/lms-openapi.yaml
index 202b983212b3..9d95b947aef7 100644
--- a/docs/lms-openapi.yaml
+++ b/docs/lms-openapi.yaml
@@ -58,114 +58,6 @@ paths:
         in: path
         required: true
         type: string
-  /badges/v1/assertions/user/{username}/:
-    get:
-      operationId: badges_v1_assertions_user_read
-      summary: '**Use Cases**'
-      description: |-
-        Request a list of assertions for a user, optionally constrained to a course.
-
-        **Example Requests**
-
-            GET /api/badges/v1/assertions/user/{username}/
-
-        **Response Values**
-
-            Body comprised of a list of objects with the following fields:
-
-            * badge_class: The badge class the assertion was awarded for. Represented as an object
-              with the following fields:
-                * slug: The identifier for the badge class
-                * issuing_component: The software component responsible for issuing this badge.
-                * display_name: The display name of the badge.
-                * course_id: The course key of the course this badge is scoped to, or null if it isn't scoped to a course.
-                * description: A description of the award and its significance.
-                * criteria: A description of what is needed to obtain this award.
-                * image_url: A URL to the icon image used to represent this award.
-            * image_url: The baked assertion image derived from the badge_class icon-- contains metadata about the award
-              in its headers.
-            * assertion_url: The URL to the OpenBadges BadgeAssertion object, for verification by compatible tools
-              and software.
-
-        **Params**
-
-            * slug (optional): The identifier for a particular badge class to filter by.
-            * issuing_component (optional): The issuing component for a particular badge class to filter by
-              (requires slug to have been specified, or this will be ignored.) If slug is provided and this is not,
-              assumes the issuing_component should be empty.
-            * course_id (optional): Returns assertions that were awarded as part of a particular course. If slug is
-              provided, and this field is not specified, assumes that the target badge has an empty course_id field.
-              '*' may be used to get all badges with the specified slug, issuing_component combination across all courses.
-
-        **Returns**
-
-            * 200 on success, with a list of Badge Assertion objects.
-            * 403 if a user who does not have permission to masquerade as
-              another user specifies a username other than their own.
-            * 404 if the specified user does not exist
-
-            {
-                "count": 7,
-                "previous": null,
-                "num_pages": 1,
-                "results": [
-                    {
-                        "badge_class": {
-                            "slug": "special_award",
-                            "issuing_component": "openedx__course",
-                            "display_name": "Very Special Award",
-                            "course_id": "course-v1:edX+DemoX+Demo_Course",
-                            "description": "Awarded for people who did something incredibly special",
-                            "criteria": "Do something incredibly special.",
-                            "image": "http://example.com/media/badge_classes/badges/special_xdpqpBv_9FYOZwN.png"
-                        },
-                        "image_url": "http://badges.example.com/media/issued/cd75b69fc1c979fcc1697c8403da2bdf.png",
-                        "assertion_url": "http://badges.example.com/public/assertions/07020647-e772-44dd-98b7-d13d34335ca6"
-                    },
-                ...
-                ]
-            }
-      parameters:
-        - name: page
-          in: query
-          description: A page number within the paginated result set.
-          required: false
-          type: integer
-        - name: page_size
-          in: query
-          description: Number of results to return per page.
-          required: false
-          type: integer
-      responses:
-        '200':
-          description: ''
-          schema:
-            required:
-              - count
-              - results
-            type: object
-            properties:
-              count:
-                type: integer
-              next:
-                type: string
-                format: uri
-                x-nullable: true
-              previous:
-                type: string
-                format: uri
-                x-nullable: true
-              results:
-                type: array
-                items:
-                  $ref: '#/definitions/BadgeAssertion'
-      tags:
-        - badges
-    parameters:
-      - name: username
-        in: path
-        required: true
-        type: string
   /bookmarks/v1/bookmarks/:
     get:
       operationId: bookmarks_v1_bookmarks_list
@@ -9477,75 +9369,6 @@ paths:
         required: true
         type: string
 definitions:
-  BadgeClass:
-    required:
-      - slug
-      - display_name
-      - description
-      - criteria
-    type: object
-    properties:
-      slug:
-        title: Slug
-        type: string
-        format: slug
-        pattern: ^[-a-zA-Z0-9_]+$
-        maxLength: 255
-        minLength: 1
-      issuing_component:
-        title: Issuing component
-        type: string
-        format: slug
-        pattern: ^[-a-zA-Z0-9_]+$
-        default: ''
-        maxLength: 50
-      display_name:
-        title: Display name
-        type: string
-        maxLength: 255
-        minLength: 1
-      course_id:
-        title: Course id
-        type: string
-        maxLength: 255
-      description:
-        title: Description
-        type: string
-        minLength: 1
-      criteria:
-        title: Criteria
-        type: string
-        minLength: 1
-      image_url:
-        title: Image url
-        type: string
-        readOnly: true
-        format: uri
-  BadgeAssertion:
-    required:
-      - image_url
-      - assertion_url
-    type: object
-    properties:
-      badge_class:
-        $ref: '#/definitions/BadgeClass'
-      image_url:
-        title: Image url
-        type: string
-        format: uri
-        maxLength: 200
-        minLength: 1
-      assertion_url:
-        title: Assertion url
-        type: string
-        format: uri
-        maxLength: 200
-        minLength: 1
-      created:
-        title: Created
-        type: string
-        format: date-time
-        readOnly: true
   CCXCourse:
     required:
       - master_course_id
diff --git a/docs/references/docstrings/lms_index.rst b/docs/references/docstrings/lms_index.rst
index 108a65cd39ea..43676bfdc1a6 100644
--- a/docs/references/docstrings/lms_index.rst
+++ b/docs/references/docstrings/lms_index.rst
@@ -9,7 +9,6 @@ Studio.
     :maxdepth: 2
 
     lms/modules
-    lms/djangoapps/badges/modules
     lms/djangoapps/branding/modules
     lms/djangoapps/bulk_email/modules
     lms/djangoapps/courseware/modules
diff --git a/lms/djangoapps/badges/admin.py b/lms/djangoapps/badges/admin.py
deleted file mode 100644
index 096ac6f92ce0..000000000000
--- a/lms/djangoapps/badges/admin.py
+++ /dev/null
@@ -1,20 +0,0 @@
-"""
-Admin registration for Badge Models
-"""
-
-
-from config_models.admin import ConfigurationModelAdmin
-from django.contrib import admin
-
-from lms.djangoapps.badges.models import (
-    BadgeAssertion,
-    BadgeClass,
-    CourseCompleteImageConfiguration,
-    CourseEventBadgesConfiguration
-)
-
-admin.site.register(CourseCompleteImageConfiguration)
-admin.site.register(BadgeClass)
-admin.site.register(BadgeAssertion)
-# Use the standard Configuration Model Admin handler for this model.
-admin.site.register(CourseEventBadgesConfiguration, ConfigurationModelAdmin)
diff --git a/lms/djangoapps/badges/api/serializers.py b/lms/djangoapps/badges/api/serializers.py
deleted file mode 100644
index 2bcdd740eb33..000000000000
--- a/lms/djangoapps/badges/api/serializers.py
+++ /dev/null
@@ -1,30 +0,0 @@
-"""
-Serializers for Badges
-"""
-
-
-from rest_framework import serializers
-
-from lms.djangoapps.badges.models import BadgeAssertion, BadgeClass
-
-
-class BadgeClassSerializer(serializers.ModelSerializer):
-    """
-    Serializer for BadgeClass model.
-    """
-    image_url = serializers.ImageField(source='image')
-
-    class Meta:
-        model = BadgeClass
-        fields = ('slug', 'issuing_component', 'display_name', 'course_id', 'description', 'criteria', 'image_url')
-
-
-class BadgeAssertionSerializer(serializers.ModelSerializer):
-    """
-    Serializer for the BadgeAssertion model.
-    """
-    badge_class = BadgeClassSerializer(read_only=True)
-
-    class Meta:
-        model = BadgeAssertion
-        fields = ('badge_class', 'image_url', 'assertion_url', 'created')
diff --git a/lms/djangoapps/badges/api/tests.py b/lms/djangoapps/badges/api/tests.py
deleted file mode 100644
index e0031c29dee4..000000000000
--- a/lms/djangoapps/badges/api/tests.py
+++ /dev/null
@@ -1,218 +0,0 @@
-"""
-Tests for the badges API views.
-"""
-
-
-from ddt import data, ddt, unpack
-from django.conf import settings
-from django.test.utils import override_settings
-
-from common.djangoapps.student.tests.factories import UserFactory
-from common.djangoapps.util.testing import UrlResetMixin
-from lms.djangoapps.badges.tests.factories import BadgeAssertionFactory, BadgeClassFactory, RandomBadgeClassFactory
-from openedx.core.lib.api.test_utils import ApiTestCase
-from xmodule.modulestore.tests.django_utils import ModuleStoreTestCase  # lint-amnesty, pylint: disable=wrong-import-order
-from xmodule.modulestore.tests.factories import CourseFactory  # lint-amnesty, pylint: disable=wrong-import-order
-
-FEATURES_WITH_BADGES_ENABLED = settings.FEATURES.copy()
-FEATURES_WITH_BADGES_ENABLED['ENABLE_OPENBADGES'] = True
-
-
-@override_settings(FEATURES=FEATURES_WITH_BADGES_ENABLED)
-class UserAssertionTestCase(UrlResetMixin, ModuleStoreTestCase, ApiTestCase):
-    """
-    Mixin for badge API tests.
-    """
-
-    def setUp(self):
-        super().setUp()
-        self.course = CourseFactory.create()
-        self.user = UserFactory.create()
-        # Password defined by factory.
-        self.client.login(username=self.user.username, password='test')
-
-    def url(self):
-        """
-        Return the URL to look up the current user's assertions.
-        """
-        return f'/api/badges/v1/assertions/user/{self.user.username}/'
-
-    def check_class_structure(self, badge_class, json_class):
-        """
-        Check a JSON response against a known badge class.
-        """
-        assert badge_class.issuing_component == json_class['issuing_component']
-        assert badge_class.slug == json_class['slug']
-        assert badge_class.image.url in json_class['image_url']
-        assert badge_class.description == json_class['description']
-        assert badge_class.criteria == json_class['criteria']
-        assert (badge_class.course_id and str(badge_class.course_id)) == json_class['course_id']
-
-    def check_assertion_structure(self, assertion, json_assertion):
-        """
-        Check a JSON response against a known assertion object.
-        """
-        assert assertion.image_url == json_assertion['image_url']
-        assert assertion.assertion_url == json_assertion['assertion_url']
-        self.check_class_structure(assertion.badge_class, json_assertion['badge_class'])
-
-    def get_course_id(self, wildcard, badge_class):
-        """
-        Used for tests which may need to test for a course_id or a wildcard.
-        """
-        if wildcard:
-            return '*'
-        else:
-            return str(badge_class.course_id)
-
-    def create_badge_class(self, check_course, **kwargs):
-        """
-        Create a badge class, using a course id if it's relevant to the URL pattern.
-        """
-        if check_course:
-            return RandomBadgeClassFactory.create(course_id=self.course.location.course_key, **kwargs)
-        return RandomBadgeClassFactory.create(**kwargs)
-
-    def get_qs_args(self, check_course, wildcard, badge_class):
-        """
-        Get a dictionary to be serialized into querystring params based on class settings.
-        """
-        qs_args = {
-            'issuing_component': badge_class.issuing_component,
-            'slug': badge_class.slug,
-        }
-        if check_course:
-            qs_args['course_id'] = self.get_course_id(wildcard, badge_class)
-        return qs_args
-
-
-class TestUserBadgeAssertions(UserAssertionTestCase):
-    """
-    Test the general badge assertions retrieval view.
-    """
-
-    def test_get_assertions(self):
-        """
-        Verify we can get all of a user's badge assertions.
-        """
-        for dummy in range(3):
-            BadgeAssertionFactory(user=self.user)
-        # Add in a course scoped badge-- these should not be excluded from the full listing.
-        BadgeAssertionFactory(user=self.user, badge_class=BadgeClassFactory(course_id=self.course.location.course_key))
-        # Should not be included.
-        for dummy in range(3):
-            self.create_badge_class(False)
-        response = self.get_json(self.url())
-        assert len(response['results']) == 4
-
-    def test_assertion_structure(self):
-        badge_class = self.create_badge_class(False)
-        assertion = BadgeAssertionFactory.create(user=self.user, badge_class=badge_class)
-        response = self.get_json(self.url())
-        self.check_assertion_structure(assertion, response['results'][0])
-
-
-class TestUserCourseBadgeAssertions(UserAssertionTestCase):
-    """
-    Test the Badge Assertions view with the course_id filter.
-    """
-
-    def test_get_assertions(self):
-        """
-        Verify we can get assertions via the course_id and username.
-        """
-        course_key = self.course.location.course_key
-        badge_class = BadgeClassFactory.create(course_id=course_key)
-        for dummy in range(3):
-            BadgeAssertionFactory.create(user=self.user, badge_class=badge_class)
-        # Should not be included, as they don't share the target badge class.
-        for dummy in range(3):
-            BadgeAssertionFactory.create(user=self.user)
-        # Also should not be included, as they don't share the same user.
-        for dummy in range(6):
-            BadgeAssertionFactory.create(badge_class=badge_class)
-        response = self.get_json(self.url(), data={'course_id': str(course_key)})
-        assert len(response['results']) == 3
-        unused_course = CourseFactory.create()
-        response = self.get_json(self.url(), data={'course_id': str(unused_course.location.course_key)})
-        assert len(response['results']) == 0
-
-    def test_assertion_structure(self):
-        """
-        Verify the badge assertion structure is as expected when a course is involved.
-        """
-        course_key = self.course.location.course_key
-        badge_class = BadgeClassFactory.create(course_id=course_key)
-        assertion = BadgeAssertionFactory.create(badge_class=badge_class, user=self.user)
-        response = self.get_json(self.url())
-        self.check_assertion_structure(assertion, response['results'][0])
-
-
-@ddt
-class TestUserBadgeAssertionsByClass(UserAssertionTestCase):
-    """
-    Test the Badge Assertions view with the badge class filter.
-    """
-
-    @unpack
-    @data((False, False), (True, False), (True, True))
-    def test_get_assertions(self, check_course, wildcard):
-        """
-        Verify we can get assertions via the badge class and username.
-        """
-        badge_class = self.create_badge_class(check_course)
-        for dummy in range(3):
-            BadgeAssertionFactory.create(user=self.user, badge_class=badge_class)
-        if badge_class.course_id:
-            # Also create a version of this badge under a different course.
-            alt_class = BadgeClassFactory.create(
-                slug=badge_class.slug, issuing_component=badge_class.issuing_component,
-                course_id=CourseFactory.create().location.course_key
-            )
-            BadgeAssertionFactory.create(user=self.user, badge_class=alt_class)
-        # Same badge class, but different user. Should not show up in the list.
-        for dummy in range(5):
-            BadgeAssertionFactory.create(badge_class=badge_class)
-        # Different badge class AND different user. Certainly shouldn't show up in the list!
-        for dummy in range(6):
-            BadgeAssertionFactory.create()
-
-        response = self.get_json(
-            self.url(),
-            data=self.get_qs_args(check_course, wildcard, badge_class),
-        )
-        if wildcard:
-            expected_length = 4
-        else:
-            expected_length = 3
-        assert len(response['results']) == expected_length
-        unused_class = self.create_badge_class(check_course, slug='unused_slug', issuing_component='unused_component')
-
-        response = self.get_json(
-            self.url(),
-            data=self.get_qs_args(check_course, wildcard, unused_class),
-        )
-        assert len(response['results']) == 0
-
-    def check_badge_class_assertion(self, check_course, wildcard, badge_class):
-        """
-        Given a badge class, create an assertion for the current user and fetch it, checking the structure.
-        """
-        assertion = BadgeAssertionFactory.create(badge_class=badge_class, user=self.user)
-        response = self.get_json(
-            self.url(),
-            data=self.get_qs_args(check_course, wildcard, badge_class),
-        )
-        self.check_assertion_structure(assertion, response['results'][0])
-
-    @unpack
-    @data((False, False), (True, False), (True, True))
-    def test_assertion_structure(self, check_course, wildcard):
-        self.check_badge_class_assertion(check_course, wildcard, self.create_badge_class(check_course))
-
-    @unpack
-    @data((False, False), (True, False), (True, True))
-    def test_empty_issuing_component(self, check_course, wildcard):
-        self.check_badge_class_assertion(
-            check_course, wildcard, self.create_badge_class(check_course, issuing_component='')
-        )
diff --git a/lms/djangoapps/badges/api/urls.py b/lms/djangoapps/badges/api/urls.py
deleted file mode 100644
index 95129fafcd1f..000000000000
--- a/lms/djangoapps/badges/api/urls.py
+++ /dev/null
@@ -1,14 +0,0 @@
-"""
-URLs for badges API
-"""
-
-
-from django.conf import settings
-from django.urls import re_path
-
-from .views import UserBadgeAssertions
-
-urlpatterns = [
-    re_path('^assertions/user/' + settings.USERNAME_PATTERN + '/$',
-            UserBadgeAssertions.as_view(), name='user_assertions'),
-]
diff --git a/lms/djangoapps/badges/api/views.py b/lms/djangoapps/badges/api/views.py
deleted file mode 100644
index b5b5b9cac4d4..000000000000
--- a/lms/djangoapps/badges/api/views.py
+++ /dev/null
@@ -1,139 +0,0 @@
-"""
-API views for badges
-"""
-
-
-from edx_rest_framework_extensions.auth.session.authentication import \
-    SessionAuthenticationAllowInactiveUser
-from opaque_keys import InvalidKeyError
-from opaque_keys.edx.django.models import CourseKeyField
-from opaque_keys.edx.keys import CourseKey
-from rest_framework import generics
-from rest_framework.exceptions import APIException
-
-from lms.djangoapps.badges.models import BadgeAssertion
-from openedx.core.djangoapps.user_api.permissions import is_field_shared_factory
-from openedx.core.lib.api.authentication import BearerAuthenticationAllowInactiveUser
-
-from .serializers import BadgeAssertionSerializer
-
-
-class InvalidCourseKeyError(APIException):
-    """
-    Raised the course key given isn't valid.
-    """
-    status_code = 400
-    default_detail = "The course key provided was invalid."
-
-
-class UserBadgeAssertions(generics.ListAPIView):
-    """
-    **Use Cases**
-
-        Request a list of assertions for a user, optionally constrained to a course.
-
-    **Example Requests**
-
-        GET /api/badges/v1/assertions/user/{username}/
-
-    **Response Values**
-
-        Body comprised of a list of objects with the following fields:
-
-        * badge_class: The badge class the assertion was awarded for. Represented as an object
-          with the following fields:
-            * slug: The identifier for the badge class
-            * issuing_component: The software component responsible for issuing this badge.
-            * display_name: The display name of the badge.
-            * course_id: The course key of the course this badge is scoped to, or null if it isn't scoped to a course.
-            * description: A description of the award and its significance.
-            * criteria: A description of what is needed to obtain this award.
-            * image_url: A URL to the icon image used to represent this award.
-        * image_url: The baked assertion image derived from the badge_class icon-- contains metadata about the award
-          in its headers.
-        * assertion_url: The URL to the OpenBadges BadgeAssertion object, for verification by compatible tools
-          and software.
-
-    **Params**
-
-        * slug (optional): The identifier for a particular badge class to filter by.
-        * issuing_component (optional): The issuing component for a particular badge class to filter by
-          (requires slug to have been specified, or this will be ignored.) If slug is provided and this is not,
-          assumes the issuing_component should be empty.
-        * course_id (optional): Returns assertions that were awarded as part of a particular course. If slug is
-          provided, and this field is not specified, assumes that the target badge has an empty course_id field.
-          '*' may be used to get all badges with the specified slug, issuing_component combination across all courses.
-
-    **Returns**
-
-        * 200 on success, with a list of Badge Assertion objects.
-        * 403 if a user who does not have permission to masquerade as
-          another user specifies a username other than their own.
-        * 404 if the specified user does not exist
-
-        {
-            "count": 7,
-            "previous": null,
-            "num_pages": 1,
-            "results": [
-                {
-                    "badge_class": {
-                        "slug": "special_award",
-                        "issuing_component": "openedx__course",
-                        "display_name": "Very Special Award",
-                        "course_id": "course-v1:edX+DemoX+Demo_Course",
-                        "description": "Awarded for people who did something incredibly special",
-                        "criteria": "Do something incredibly special.",
-                        "image": "http://example.com/media/badge_classes/badges/special_xdpqpBv_9FYOZwN.png"
-                    },
-                    "image_url": "http://badges.example.com/media/issued/cd75b69fc1c979fcc1697c8403da2bdf.png",
-                    "assertion_url": "http://badges.example.com/public/assertions/07020647-e772-44dd-98b7-d13d34335ca6"
-                },
-            ...
-            ]
-        }
-    """
-    serializer_class = BadgeAssertionSerializer
-    authentication_classes = (
-        BearerAuthenticationAllowInactiveUser,
-        SessionAuthenticationAllowInactiveUser
-    )
-    permission_classes = (is_field_shared_factory("accomplishments_shared"),)
-
-    def filter_queryset(self, queryset):
-        """
-        Return most recent to least recent badge.
-        """
-        return queryset.order_by('-created')
-
-    def get_queryset(self):
-        """
-        Get all badges for the username specified.
-        """
-        queryset = BadgeAssertion.objects.filter(user__username=self.kwargs['username'])
-        provided_course_id = self.request.query_params.get('course_id')
-        if provided_course_id == '*':
-            # We might want to get all the matching course scoped badges to see how many courses
-            # a user managed to get a specific award on.
-            course_id = None
-        elif provided_course_id:
-            try:
-                course_id = CourseKey.from_string(provided_course_id)
-            except InvalidKeyError:
-                raise InvalidCourseKeyError  # lint-amnesty, pylint: disable=raise-missing-from
-        elif 'slug' not in self.request.query_params:
-            # Need to get all badges for the user.
-            course_id = None
-        else:
-            # Django won't let us use 'None' for querying a ForeignKey field. We have to use this special
-            # 'Empty' value to indicate we're looking only for badges without a course key set.
-            course_id = CourseKeyField.Empty
-
-        if course_id is not None:
-            queryset = queryset.filter(badge_class__course_id=course_id)
-        if self.request.query_params.get('slug'):
-            queryset = queryset.filter(
-                badge_class__slug=self.request.query_params['slug'],
-                badge_class__issuing_component=self.request.query_params.get('issuing_component', '')
-            )
-        return queryset
diff --git a/lms/djangoapps/badges/apps.py b/lms/djangoapps/badges/apps.py
index 4380a609b249..778c1b5790b2 100644
--- a/lms/djangoapps/badges/apps.py
+++ b/lms/djangoapps/badges/apps.py
@@ -13,9 +13,3 @@ class BadgesConfig(AppConfig):
     Application Configuration for Badges.
     """
     name = 'lms.djangoapps.badges'
-
-    def ready(self):
-        """
-        Connect signal handlers.
-        """
-        from . import handlers  # pylint: disable=unused-import
diff --git a/lms/djangoapps/badges/backends/__init__.py b/lms/djangoapps/badges/backends/__init__.py
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/lms/djangoapps/badges/backends/badgr.py b/lms/djangoapps/badges/backends/badgr.py
deleted file mode 100644
index 7569c41a2a16..000000000000
--- a/lms/djangoapps/badges/backends/badgr.py
+++ /dev/null
@@ -1,324 +0,0 @@
-"""
-Badge Awarding backend for Badgr-Server.
-"""
-
-
-import base64
-import datetime
-import json
-import hashlib
-import logging
-import mimetypes
-
-import requests
-from cryptography.fernet import Fernet
-from django.conf import settings
-from django.core.exceptions import ImproperlyConfigured
-from eventtracking import tracker
-from lazy import lazy  # lint-amnesty, pylint: disable=no-name-in-module
-from requests.packages.urllib3.exceptions import HTTPError  # lint-amnesty, pylint: disable=import-error
-
-from edx_django_utils.cache import TieredCache
-
-from lms.djangoapps.badges.backends.base import BadgeBackend
-from lms.djangoapps.badges.models import BadgeAssertion
-
-MAX_SLUG_LENGTH = 255
-LOGGER = logging.getLogger(__name__)
-
-
-class BadgrBackend(BadgeBackend):
-    """
-    Backend for Badgr-Server by Concentric Sky. http://info.badgr.io/
-    """
-    badges = []
-
-    def __init__(self):
-        super().__init__()
-        if None in (settings.BADGR_USERNAME,
-                    settings.BADGR_PASSWORD,
-                    settings.BADGR_TOKENS_CACHE_KEY,
-                    settings.BADGR_ISSUER_SLUG,
-                    settings.BADGR_BASE_URL):
-            error_msg = (
-                "One or more of the required settings are not defined. "
-                "Required settings: BADGR_USERNAME, BADGR_PASSWORD, "
-                "BADGR_TOKENS_CACHE_KEY, BADGR_ISSUER_SLUG, BADGR_BASE_URL.")
-            LOGGER.error(error_msg)
-            raise ImproperlyConfigured(error_msg)
-
-    @lazy
-    def _base_url(self):
-        """
-        Base URL for API requests that contain the issuer slug.
-        """
-        return f"{settings.BADGR_BASE_URL}/v2/issuers/{settings.BADGR_ISSUER_SLUG}"
-
-    @lazy
-    def _badge_create_url(self):
-        """
-        URL for generating a new Badge specification
-        """
-        return f"{self._base_url}/badgeclasses"
-
-    def _badge_url(self, slug):
-        """
-        Get the URL for a course's badge in a given mode.
-        """
-        return f"{settings.BADGR_BASE_URL}/v2/badgeclasses/{slug}"
-
-    def _assertion_url(self, slug):
-        """
-        URL for generating a new assertion.
-        """
-        return f"{self._badge_url(slug)}/assertions"
-
-    def _slugify(self, badge_class):
-        """
-        Get a compatible badge slug from the specification.
-        """
-        slug = badge_class.issuing_component + badge_class.slug
-        if badge_class.issuing_component and badge_class.course_id:
-            # Make this unique to the course, and down to 64 characters.
-            # We don't do this to badges without issuing_component set for backwards compatibility.
-            slug = hashlib.sha256((slug + str(badge_class.course_id)).encode('utf-8')).hexdigest()
-        if len(slug) > MAX_SLUG_LENGTH:
-            # Will be 64 characters.
-            slug = hashlib.sha256(slug).hexdigest()
-        return slug
-
-    def _log_if_raised(self, response, data):
-        """
-        Log server response if there was an error.
-        """
-        try:
-            response.raise_for_status()
-        except HTTPError:
-            LOGGER.error(
-                "Encountered an error when contacting the Badgr-Server. Request sent to %r with headers %r.\n"
-                "and data values %r\n"
-                "Response status was %s.\n%s",
-                response.request.url, response.request.headers,
-                data,
-                response.status_code, response.content
-            )
-            raise
-
-    def _create_badge(self, badge_class):
-        """
-        Create the badge class on Badgr.
-        """
-        image = badge_class.image
-        # We don't want to bother validating the file any further than making sure we can detect its MIME type,
-        # for HTTP. The Badgr-Server should tell us if there's anything in particular wrong with it.
-        content_type, __ = mimetypes.guess_type(image.name)
-        if not content_type:
-            raise ValueError(
-                "Could not determine content-type of image! Make sure it is a properly named .png file. "
-                "Filename was: {}".format(image.name)
-            )
-        with open(image.path, 'rb') as image_file:
-            files = {'image': (image.name, image_file, content_type)}
-            data = {
-                'name': badge_class.display_name,
-                'criteriaUrl': badge_class.criteria,
-                'description': badge_class.description,
-            }
-            result = requests.post(
-                self._badge_create_url, headers=self._get_headers(),
-                data=data, files=files, timeout=settings.BADGR_TIMEOUT)
-            self._log_if_raised(result, data)
-            try:
-                result_json = result.json()
-                badgr_badge_class = result_json['result'][0]
-                badgr_server_slug = badgr_badge_class.get('entityId')
-                badge_class.badgr_server_slug = badgr_server_slug
-                badge_class.save()
-            except Exception as excep:  # pylint: disable=broad-except
-                LOGGER.error(
-                    'Error on saving Badgr Server Slug of badge_class slug '
-                    '"{0}" with response json "{1}" : {2}'.format(
-                        badge_class.slug, result.json(), excep))
-
-    def _send_assertion_created_event(self, user, assertion):
-        """
-        Send an analytics event to record the creation of a badge assertion.
-        """
-        tracker.emit(
-            'edx.badge.assertion.created', {
-                'user_id': user.id,
-                'badge_slug': assertion.badge_class.slug,
-                'badge_badgr_server_slug': assertion.badge_class.badgr_server_slug,
-                'badge_name': assertion.badge_class.display_name,
-                'issuing_component': assertion.badge_class.issuing_component,
-                'course_id': str(assertion.badge_class.course_id),
-                'enrollment_mode': assertion.badge_class.mode,
-                'assertion_id': assertion.id,
-                'assertion_image_url': assertion.image_url,
-                'assertion_json_url': assertion.assertion_url,
-                'issuer': assertion.data.get('issuer'),
-            }
-        )
-
-    def _create_assertion(self, badge_class, user, evidence_url):
-        """
-        Register an assertion with the Badgr server for a particular user for a specific class.
-        """
-        data = {
-            "recipient": {
-                "identity": user.email,
-                "type": "email"
-            },
-            "evidence": [
-                {
-                    "url": evidence_url
-                }
-            ],
-            "notify": settings.BADGR_ENABLE_NOTIFICATIONS,
-        }
-        response = requests.post(
-            self._assertion_url(badge_class.badgr_server_slug),
-            headers=self._get_headers(),
-            json=data,
-            timeout=settings.BADGR_TIMEOUT
-        )
-        self._log_if_raised(response, data)
-        assertion, __ = BadgeAssertion.objects.get_or_create(user=user, badge_class=badge_class)
-        try:
-            response_json = response.json()
-            assertion.data = response_json['result'][0]
-            assertion.image_url = assertion.data['image']
-            assertion.assertion_url = assertion.data['openBadgeId']
-            assertion.backend = 'BadgrBackend'
-            assertion.save()
-            self._send_assertion_created_event(user, assertion)
-            return assertion
-
-        except Exception as exc:  # pylint: disable=broad-except
-            LOGGER.error(
-                'Error saving BadgeAssertion for user: "{0}" '
-                'with response from server: {1};'
-                'Encountered exception: {2}'.format(
-                    user.email, response.text, exc))
-
-    @staticmethod
-    def _fernet_setup():
-        """
-        Set up the Fernet class for encrypting/decrypting tokens.
-        Fernet keys must always be URL-safe base64 encoded 32-byte binary
-        strings. Use the SECRET_KEY for creating the encryption key.
-        """
-        fernet_key = base64.urlsafe_b64encode(
-            settings.SECRET_KEY.ljust(64).encode('utf-8')[:32]
-        )
-        return Fernet(fernet_key)
-
-    def _encrypt_token(self, token):
-        """
-        Encrypt a token
-        """
-        fernet = self._fernet_setup()
-        return fernet.encrypt(token.encode('utf-8'))
-
-    def _decrypt_token(self, token):
-        """
-        Decrypt a token
-        """
-        fernet = self._fernet_setup()
-        return fernet.decrypt(token).decode()
-
-    def _get_and_cache_oauth_tokens(self, refresh_token=None):
-        """
-        Get or renew OAuth tokens. If a refresh_token is provided,
-        use it to renew tokens, otherwise create new ones.
-        Once tokens are created/renewed, encrypt the values and cache them.
-        """
-        data = {
-            'username': settings.BADGR_USERNAME,
-            'password': settings.BADGR_PASSWORD,
-        }
-        if refresh_token:
-            data = {
-                'grant_type': 'refresh_token',
-                'refresh_token': refresh_token
-            }
-
-        oauth_url = "{}/o/token".format(settings.BADGR_BASE_URL)
-
-        response = requests.post(
-            oauth_url, data=data, timeout=settings.BADGR_TIMEOUT
-        )
-        self._log_if_raised(response, data)
-        try:
-            data = response.json()
-            result = {
-                'access_token': self._encrypt_token(data['access_token']),
-                'refresh_token': self._encrypt_token(data['refresh_token']),
-                'expires_at': datetime.datetime.utcnow() + datetime.timedelta(
-                    seconds=data['expires_in'])
-            }
-            # The refresh_token is long-lived, we want to be able to retrieve
-            # it from cache as long as possible.
-            # Set the cache timeout to None so the cache key never expires
-            # (https://docs.djangoproject.com/en/2.2/topics/cache/#cache-arguments)
-            TieredCache.set_all_tiers(
-                settings.BADGR_TOKENS_CACHE_KEY, result, None)
-            return result
-        except (KeyError, json.decoder.JSONDecodeError) as json_error:
-            raise requests.RequestException(response=response) from json_error
-
-    def _get_access_token(self):
-        """
-        Get an access token from cache if one is present and valid. If a
-        token is cached but expired, renew it. If all fails or a token has
-        not yet been cached, create a new one.
-        """
-        tokens = {}
-        cached_response = TieredCache.get_cached_response(
-            settings.BADGR_TOKENS_CACHE_KEY)
-        if cached_response.is_found:
-            cached_tokens = cached_response.value
-            # add a 5 seconds buffer to the cutoff timestamp to make sure
-            # the token will not expire while in use
-            expiry_cutoff = (
-                datetime.datetime.utcnow() + datetime.timedelta(seconds=5))
-            if cached_tokens.get('expires_at') > expiry_cutoff:
-                tokens = cached_tokens
-            else:
-                # renew the tokens with the cached `refresh_token`
-                refresh_token = self._decrypt_token(cached_tokens.get(
-                    'refresh_token'))
-                tokens = self._get_and_cache_oauth_tokens(
-                    refresh_token=refresh_token)
-
-        # if no tokens are cached or something went wrong with
-        # retreiving/renewing them, go and create new tokens
-        if not tokens:
-            tokens = self._get_and_cache_oauth_tokens()
-        return self._decrypt_token(tokens.get('access_token'))
-
-    def _get_headers(self):
-        """
-        Headers to send along with the request-- used for authentication.
-        """
-        access_token = self._get_access_token()
-        return {'Authorization': 'Bearer {}'.format(access_token)}
-
-    def _ensure_badge_created(self, badge_class):
-        """
-        Verify a badge has been created for this badge class, and create it if not.
-        """
-        slug = badge_class.badgr_server_slug
-        if slug in BadgrBackend.badges:
-            return
-        response = requests.get(self._badge_url(slug), headers=self._get_headers(), timeout=settings.BADGR_TIMEOUT)
-        if response.status_code != 200:
-            self._create_badge(badge_class)
-        BadgrBackend.badges.append(slug)
-
-    def award(self, badge_class, user, evidence_url=None):
-        """
-        Make sure the badge class has been created on the backend, and then award the badge class to the user.
-        """
-        self._ensure_badge_created(badge_class)
-        return self._create_assertion(badge_class, user, evidence_url)
diff --git a/lms/djangoapps/badges/backends/base.py b/lms/djangoapps/badges/backends/base.py
deleted file mode 100644
index 868ef0df7468..000000000000
--- a/lms/djangoapps/badges/backends/base.py
+++ /dev/null
@@ -1,18 +0,0 @@
-"""
-Base class for badge backends.
-"""
-
-
-from abc import ABCMeta, abstractmethod
-
-
-class BadgeBackend(metaclass=ABCMeta):
-    """
-    Defines the interface for badging backends.
-    """
-
-    @abstractmethod
-    def award(self, badge_class, user, evidence_url=None):
-        """
-        Create a badge assertion for the user using this backend.
-        """
diff --git a/lms/djangoapps/badges/backends/tests/__init__.py b/lms/djangoapps/badges/backends/tests/__init__.py
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/lms/djangoapps/badges/backends/tests/dummy_backend.py b/lms/djangoapps/badges/backends/tests/dummy_backend.py
deleted file mode 100644
index 042ffe9b24c6..000000000000
--- a/lms/djangoapps/badges/backends/tests/dummy_backend.py
+++ /dev/null
@@ -1,15 +0,0 @@
-"""
-Dummy backend, for use in testing.
-"""
-
-
-from lms.djangoapps.badges.backends.base import BadgeBackend
-from lms.djangoapps.badges.tests.factories import BadgeAssertionFactory
-
-
-class DummyBackend(BadgeBackend):
-    """
-    Dummy backend that creates assertions without contacting any real-world backend.
-    """
-    def award(self, badge_class, user, evidence_url=None):
-        return BadgeAssertionFactory(badge_class=badge_class, user=user)
diff --git a/lms/djangoapps/badges/backends/tests/test_badgr_backend.py b/lms/djangoapps/badges/backends/tests/test_badgr_backend.py
deleted file mode 100644
index 7e9f2d367a19..000000000000
--- a/lms/djangoapps/badges/backends/tests/test_badgr_backend.py
+++ /dev/null
@@ -1,301 +0,0 @@
-"""
-Tests for BadgrBackend
-"""
-
-import datetime
-from unittest.mock import Mock, call, patch
-
-import json
-import ddt
-import httpretty
-from django.test.utils import override_settings
-from lazy.lazy import lazy  # lint-amnesty, pylint: disable=no-name-in-module
-
-from edx_django_utils.cache import TieredCache
-from common.djangoapps.student.tests.factories import CourseEnrollmentFactory, UserFactory
-from common.djangoapps.track.tests import FROZEN_TIME, EventTrackingTestCase
-from lms.djangoapps.badges.backends.badgr import BadgrBackend
-from lms.djangoapps.badges.models import BadgeAssertion
-from lms.djangoapps.badges.tests.factories import BadgeClassFactory
-from openedx.core.lib.tests.assertions.events import assert_event_matches
-from xmodule.modulestore.tests.django_utils import ModuleStoreTestCase  # lint-amnesty, pylint: disable=wrong-import-order
-from xmodule.modulestore.tests.factories import CourseFactory  # lint-amnesty, pylint: disable=wrong-import-order
-
-BADGR_SETTINGS = {
-    'BADGR_BASE_URL': 'https://example.com',
-    'BADGR_ISSUER_SLUG': 'test-issuer',
-    'BADGR_USERNAME': 'example@example.com',
-    'BADGR_PASSWORD': 'password',
-    'BADGR_TOKENS_CACHE_KEY': 'badgr-test-cache-key'
-}
-
-# Should be the hashed result of test_slug as the slug, and test_component as the component
-EXAMPLE_SLUG = '9e915d55bb304a73d20c453531d3c27f81574218413c23903823d20d11b587ae'
-BADGR_SERVER_SLUG = 'test_badgr_server_slug'
-
-
-# pylint: disable=protected-access
-@ddt.ddt
-@override_settings(**BADGR_SETTINGS)
-@httpretty.activate
-class BadgrBackendTestCase(ModuleStoreTestCase, EventTrackingTestCase):
-    """
-    Tests the BadgeHandler object
-    """
-
-    def setUp(self):
-        """
-        Create a course and user to test with.
-        """
-        super().setUp()
-        # Need key to be deterministic to test slugs.
-        self.course = CourseFactory.create(
-            org='edX', course='course_test', run='test_run', display_name='Badged',
-            start=datetime.datetime(year=2015, month=5, day=19),
-            end=datetime.datetime(year=2015, month=5, day=20)
-        )
-        self.user = UserFactory.create(email='example@example.com')
-        CourseEnrollmentFactory.create(user=self.user, course_id=self.course.location.course_key, mode='honor')
-        # Need to empty this on each run.
-        BadgrBackend.badges = []
-        self.badge_class = BadgeClassFactory.create(course_id=self.course.location.course_key)
-        self.legacy_badge_class = BadgeClassFactory.create(
-            course_id=self.course.location.course_key, issuing_component=''
-        )
-        self.no_course_badge_class = BadgeClassFactory.create()
-        TieredCache.dangerous_clear_all_tiers()
-        httpretty.httpretty.reset()
-
-    @lazy
-    def handler(self):
-        """
-        Lazily loads a BadgeHandler object for the current course. Can't do this on setUp because the settings
-        overrides aren't in place.
-        """
-        return BadgrBackend()
-
-    def _mock_badgr_tokens_api(self, result):
-        assert httpretty.is_enabled()
-        responses = [httpretty.Response(body=json.dumps(result),
-                                        content_type='application/json')]
-        httpretty.register_uri(httpretty.POST,
-                               'https://example.com/o/token',
-                               responses=responses)
-
-    def test_urls(self):
-        """
-        Make sure the handler generates the correct URLs for different API tasks.
-        """
-        assert self.handler._base_url == 'https://example.com/v2/issuers/test-issuer'
-        # lint-amnesty, pylint: disable=no-member
-        assert self.handler._badge_create_url == 'https://example.com/v2/issuers/test-issuer/badgeclasses'
-        # lint-amnesty, pylint: disable=no-member
-        assert self.handler._badge_url('test_slug_here') ==\
-               'https://example.com/v2/badgeclasses/test_slug_here'
-        assert self.handler._assertion_url('another_test_slug') ==\
-               'https://example.com/v2/badgeclasses/another_test_slug/assertions'
-
-    def check_headers(self, headers):
-        """
-        Verify the a headers dict from a requests call matches the proper auth info.
-        """
-        assert headers == {'Authorization': 'Bearer 12345'}
-
-    def test_get_headers(self):
-        """
-        Check to make sure the handler generates appropriate HTTP headers.
-        """
-        self.handler._get_access_token = Mock(return_value='12345')
-        self.check_headers(self.handler._get_headers())  # lint-amnesty, pylint: disable=no-member
-
-    @patch('requests.post')
-    def test_create_badge(self, post):
-        """
-        Verify badge spec creation works.
-        """
-        self.handler._get_access_token = Mock(return_value='12345')
-        with self.allow_transaction_exception():
-            self.handler._create_badge(self.badge_class)
-        args, kwargs = post.call_args
-        assert args[0] == 'https://example.com/v2/issuers/test-issuer/badgeclasses'
-        assert kwargs['files']['image'][0] == self.badge_class.image.name
-        assert kwargs['files']['image'][2] == 'image/png'
-        self.check_headers(kwargs['headers'])
-        assert kwargs['data'] ==\
-               {'name': 'Test Badge',
-                'criteriaUrl': 'https://example.com/syllabus',
-                'description': "Yay! It's a test badge."}
-
-    def test_ensure_badge_created_cache(self):
-        """
-        Make sure ensure_badge_created doesn't call create_badge if we know the badge is already there.
-        """
-        BadgrBackend.badges.append(BADGR_SERVER_SLUG)
-        self.handler._create_badge = Mock()
-        self.handler._ensure_badge_created(self.badge_class)  # lint-amnesty, pylint: disable=no-member
-        assert not self.handler._create_badge.called
-
-    @ddt.unpack
-    @ddt.data(
-        ('badge_class', EXAMPLE_SLUG),
-        ('legacy_badge_class', 'test_slug'),
-        ('no_course_badge_class', 'test_componenttest_slug')
-    )
-    def test_slugs(self, badge_class_type, slug):
-        assert self.handler._slugify(getattr(self, badge_class_type)) == slug
-        # lint-amnesty, pylint: disable=no-member
-
-    @patch('requests.get')
-    def test_ensure_badge_created_checks(self, get):
-        response = Mock()
-        response.status_code = 200
-        get.return_value = response
-        assert 'test_componenttest_slug' not in BadgrBackend.badges
-        self.handler._get_access_token = Mock(return_value='12345')
-        self.handler._create_badge = Mock()
-        self.handler._ensure_badge_created(self.badge_class)  # lint-amnesty, pylint: disable=no-member
-        assert get.called
-        args, kwargs = get.call_args
-        assert args[0] == (
-            'https://example.com/v2/badgeclasses/' +
-            BADGR_SERVER_SLUG)
-        self.check_headers(kwargs['headers'])
-        assert BADGR_SERVER_SLUG in BadgrBackend.badges
-        assert not self.handler._create_badge.called
-
-    @patch('requests.get')
-    def test_ensure_badge_created_creates(self, get):
-        response = Mock()
-        response.status_code = 404
-        get.return_value = response
-        assert BADGR_SERVER_SLUG not in BadgrBackend.badges
-        self.handler._get_access_token = Mock(return_value='12345')
-        self.handler._create_badge = Mock()
-        self.handler._ensure_badge_created(self.badge_class)  # lint-amnesty, pylint: disable=no-member
-        assert self.handler._create_badge.called
-        assert self.handler._create_badge.call_args == call(self.badge_class)
-        assert BADGR_SERVER_SLUG in BadgrBackend.badges
-
-    @patch('requests.post')
-    def test_badge_creation_event(self, post):
-        result = {
-            'result': [{
-                'openBadgeId': 'http://www.example.com/example',
-                'image': 'http://www.example.com/example.png',
-                'issuer': 'https://example.com/v2/issuers/test-issuer'
-            }]
-        }
-        response = Mock()
-        response.json.return_value = result
-        post.return_value = response
-        self.recreate_tracker()
-        self.handler._get_access_token = Mock(return_value='12345')
-        self.handler._create_assertion(self.badge_class, self.user, 'https://example.com/irrefutable_proof')  # lint-amnesty, pylint: disable=no-member
-        args, kwargs = post.call_args
-        assert args[0] == ((
-            'https://example.com/v2/badgeclasses/' +
-            BADGR_SERVER_SLUG) +
-            '/assertions')
-        self.check_headers(kwargs['headers'])
-        assertion = BadgeAssertion.objects.get(user=self.user, badge_class__course_id=self.course.location.course_key)
-        assert assertion.data == result['result'][0]
-        assert assertion.image_url == 'http://www.example.com/example.png'
-        assert assertion.assertion_url == 'http://www.example.com/example'
-        assert kwargs['json'] == {"recipient": {"identity": 'example@example.com', "type": "email"},
-                                  "evidence": [{"url": 'https://example.com/irrefutable_proof'}],
-                                  "notify": False}
-        assert_event_matches({
-            'name': 'edx.badge.assertion.created',
-            'data': {
-                'user_id': self.user.id,
-                'course_id': str(self.course.location.course_key),
-                'enrollment_mode': 'honor',
-                'assertion_id': assertion.id,
-                'badge_name': 'Test Badge',
-                'badge_slug': 'test_slug',
-                'badge_badgr_server_slug': BADGR_SERVER_SLUG,
-                'issuing_component': 'test_component',
-                'assertion_image_url': 'http://www.example.com/example.png',
-                'assertion_json_url': 'http://www.example.com/example',
-                'issuer': 'https://example.com/v2/issuers/test-issuer',
-            },
-            'context': {},
-            'timestamp': FROZEN_TIME
-        }, self.get_event())
-
-    def test_get_new_tokens(self):
-        result = {
-            'access_token': '12345',
-            'refresh_token': '67890',
-            'expires_in': 86400,
-        }
-        self._mock_badgr_tokens_api(result)
-        self.handler._get_and_cache_oauth_tokens()
-        assert 'o/token' in httpretty.httpretty.last_request.path
-        assert httpretty.httpretty.last_request.parsed_body == {
-            'username': ['example@example.com'],
-            'password': ['password']}
-
-    def test_renew_tokens(self):
-        result = {
-            'access_token': '12345',
-            'refresh_token': '67890',
-            'expires_in': 86400,
-        }
-        self._mock_badgr_tokens_api(result)
-        self.handler._get_and_cache_oauth_tokens(refresh_token='67890')
-        assert 'o/token' in httpretty.httpretty.last_request.path
-        assert httpretty.httpretty.last_request.parsed_body == {
-            'grant_type': ['refresh_token'],
-            'refresh_token': ['67890']}
-
-    def test_get_access_token_from_cache_valid(self):
-        encrypted_access_token = self.handler._encrypt_token('12345')
-        encrypted_refresh_token = self.handler._encrypt_token('67890')
-        tokens = {
-            'access_token': encrypted_access_token,
-            'refresh_token': encrypted_refresh_token,
-            'expires_at': datetime.datetime.utcnow() + datetime.timedelta(seconds=20)
-        }
-        TieredCache.set_all_tiers('badgr-test-cache-key', tokens, None)
-
-        access_token = self.handler._get_access_token()
-        assert access_token == self.handler._decrypt_token(
-            tokens.get('access_token'))
-
-    def test_get_access_token_from_cache_expired(self):
-        encrypted_access_token = self.handler._encrypt_token('12345')
-        encrypted_refresh_token = self.handler._encrypt_token('67890')
-        tokens = {
-            'access_token': encrypted_access_token,
-            'refresh_token': encrypted_refresh_token,
-            'expires_at': datetime.datetime.utcnow()
-        }
-        TieredCache.set_all_tiers('badgr-test-cache-key', tokens, None)
-        result = {
-            'access_token': '12345',
-            'refresh_token': '67890',
-            'expires_in': 86400,
-        }
-        self._mock_badgr_tokens_api(result)
-        access_token = self.handler._get_access_token()
-        assert access_token == result.get('access_token')
-        assert 'o/token' in httpretty.httpretty.last_request.path
-        assert httpretty.httpretty.last_request.parsed_body == {
-            'grant_type': ['refresh_token'],
-            'refresh_token': [self.handler._decrypt_token(
-                tokens.get('refresh_token'))]}
-
-    def test_get_access_token_from_cache_none(self):
-        result = {
-            'access_token': '12345',
-            'refresh_token': '67890',
-            'expires_in': 86400,
-        }
-        self._mock_badgr_tokens_api(result)
-        access_token = self.handler._get_access_token()
-        assert access_token == result.get('access_token')
-        assert 'o/token' in httpretty.httpretty.last_request.path
-        assert httpretty.httpretty.last_request.parsed_body == {
-            'username': ['example@example.com'],
-            'password': ['password']}
diff --git a/lms/djangoapps/badges/events/course_complete.py b/lms/djangoapps/badges/events/course_complete.py
index 853465dfb8d6..654e3859ef2c 100644
--- a/lms/djangoapps/badges/events/course_complete.py
+++ b/lms/djangoapps/badges/events/course_complete.py
@@ -6,14 +6,9 @@
 import hashlib
 import logging
 
-from django.urls import reverse
 from django.utils.text import slugify
 from django.utils.translation import gettext_lazy as _
 
-from lms.djangoapps.badges.models import BadgeAssertion, BadgeClass, CourseCompleteImageConfiguration
-from lms.djangoapps.badges.utils import requires_badges_enabled, site_prefix
-from xmodule.modulestore.django import modulestore  # lint-amnesty, pylint: disable=wrong-import-order
-
 LOGGER = logging.getLogger(__name__)
 
 
@@ -25,9 +20,7 @@ def course_slug(course_key, mode):
     """
     Legacy: Not to be used as a model for constructing badge slugs. Included for compatibility with the original badge
     type, awarded on course completion.
-
     Slug ought to be deterministic and limited in size so it's not too big for Badgr.
-
     Badgr's max slug length is 255.
     """
     # Seven digits should be enough to realistically avoid collisions. That's what git services use.
@@ -65,65 +58,4 @@ def evidence_url(user_id, course_key):
     Generates a URL to the user's Certificate HTML view, along with a GET variable that will signal the evidence visit
     event.
     """
-    course_id = str(course_key)
-    # avoid circular import problems
-    from lms.djangoapps.certificates.models import GeneratedCertificate
-    cert = GeneratedCertificate.eligible_certificates.get(user__id=int(user_id), course_id=course_id)
-    return site_prefix() + reverse(
-        'certificates:render_cert_by_uuid', kwargs={'certificate_uuid': cert.verify_uuid}) + '?evidence_visit=1'
-
-
-def criteria(course_key):
-    """
-    Constructs the 'criteria' URL from the course about page.
-    """
-    about_path = reverse('about_course', kwargs={'course_id': str(course_key)})
-    return f'{site_prefix()}{about_path}'
-
-
-def get_completion_badge(course_id, user):
-    """
-    Given a course key and a user, find the user's enrollment mode
-    and get the Course Completion badge.
-    """
-    from common.djangoapps.student.models import CourseEnrollment
-    badge_classes = CourseEnrollment.objects.filter(
-        user=user, course_id=course_id
-    ).order_by('-is_active')
-    if not badge_classes:
-        return None
-    mode = badge_classes[0].mode
-    course = modulestore().get_course(course_id)
-    if not course.issue_badges:
-        return None
-    return BadgeClass.get_badge_class(
-        slug=course_slug(course_id, mode),
-        issuing_component='',
-        criteria=criteria(course_id),
-        description=badge_description(course, mode),
-        course_id=course_id,
-        mode=mode,
-        display_name=course.display_name,
-        image_file_handle=CourseCompleteImageConfiguration.image_for_mode(mode)
-    )
-
-
-@requires_badges_enabled
-def course_badge_check(user, course_key):
-    """
-    Takes a GeneratedCertificate instance, and checks to see if a badge exists for this course, creating
-    it if not, should conditions be right.
-    """
-    if not modulestore().get_course(course_key).issue_badges:
-        LOGGER.info("Course is not configured to issue badges.")
-        return
-    badge_class = get_completion_badge(course_key, user)
-    if not badge_class:
-        # We're not configured to make a badge for this course mode.
-        return
-    if BadgeAssertion.objects.filter(user=user, badge_class=badge_class):
-        LOGGER.info("Completion badge already exists for this user on this course.")
-        # Badge already exists. Skip.
-        return
-    evidence = evidence_url(user.id, course_key)
-    badge_class.award(user, evidence_url=evidence)
+    return
diff --git a/lms/djangoapps/badges/events/course_meta.py b/lms/djangoapps/badges/events/course_meta.py
deleted file mode 100644
index bef7b8dd79c2..000000000000
--- a/lms/djangoapps/badges/events/course_meta.py
+++ /dev/null
@@ -1,82 +0,0 @@
-"""
-Events which have to do with a user doing something with more than one course, such
-as enrolling in a certain number, completing a certain number, or completing a specific set of courses.
-"""
-
-
-from lms.djangoapps.badges.models import BadgeClass, CourseEventBadgesConfiguration
-from lms.djangoapps.badges.utils import requires_badges_enabled
-
-
-def award_badge(config, count, user):
-    """
-    Given one of the configurations for enrollments or completions, award
-    the appropriate badge if one is configured.
-
-    config is a dictionary with integer keys and course keys as values.
-    count is the key to retrieve from this dictionary.
-    user is the user to award the badge to.
-
-    Example config:
-        {3: 'slug_for_badge_for_three_enrollments', 5: 'slug_for_badge_with_five_enrollments'}
-    """
-    slug = config.get(count)
-    if not slug:
-        return
-    badge_class = BadgeClass.get_badge_class(
-        slug=slug, issuing_component='openedx__course', create=False,
-    )
-    if not badge_class:
-        return
-    if not badge_class.get_for_user(user):
-        badge_class.award(user)
-
-
-def award_enrollment_badge(user):
-    """
-    Awards badges based on the number of courses a user is enrolled in.
-    """
-    config = CourseEventBadgesConfiguration.current().enrolled_settings
-    enrollments = user.courseenrollment_set.filter(is_active=True).count()
-    award_badge(config, enrollments, user)
-
-
-@requires_badges_enabled
-def completion_check(user):
-    """
-    Awards badges based upon the number of courses a user has 'completed'.
-    Courses are never truly complete, but they can be closed.
-
-    For this reason we use checks on certificates to find out if a user has
-    completed courses. This badge will not work if certificate generation isn't
-    enabled and run.
-    """
-    from lms.djangoapps.certificates.data import CertificateStatuses
-    config = CourseEventBadgesConfiguration.current().completed_settings
-    certificates = user.generatedcertificate_set.filter(status__in=CertificateStatuses.PASSED_STATUSES).count()
-    award_badge(config, certificates, user)
-
-
-@requires_badges_enabled
-def course_group_check(user, course_key):
-    """
-    Awards a badge if a user has completed every course in a defined set.
-    """
-    from lms.djangoapps.certificates.data import CertificateStatuses
-    config = CourseEventBadgesConfiguration.current().course_group_settings
-    awards = []
-    for slug, keys in config.items():
-        if course_key in keys:
-            certs = user.generatedcertificate_set.filter(
-                status__in=CertificateStatuses.PASSED_STATUSES,
-                course_id__in=keys,
-            )
-            if len(certs) == len(keys):
-                awards.append(slug)
-
-    for slug in awards:
-        badge_class = BadgeClass.get_badge_class(
-            slug=slug, issuing_component='openedx__course', create=False,
-        )
-        if badge_class and not badge_class.get_for_user(user):
-            badge_class.award(user)
diff --git a/lms/djangoapps/badges/events/tests/__init__.py b/lms/djangoapps/badges/events/tests/__init__.py
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/lms/djangoapps/badges/events/tests/test_course_complete.py b/lms/djangoapps/badges/events/tests/test_course_complete.py
deleted file mode 100644
index 582415d9c1d4..000000000000
--- a/lms/djangoapps/badges/events/tests/test_course_complete.py
+++ /dev/null
@@ -1,71 +0,0 @@
-"""
-Tests for the course completion helper functions.
-"""
-from datetime import datetime
-from uuid import uuid4
-
-from common.djangoapps.student.tests.factories import UserFactory
-from lms.djangoapps.badges.events import course_complete
-from lms.djangoapps.certificates.models import GeneratedCertificate
-from xmodule.modulestore.tests.django_utils import ModuleStoreTestCase  # lint-amnesty, pylint: disable=wrong-import-order
-from xmodule.modulestore.tests.factories import CourseFactory  # lint-amnesty, pylint: disable=wrong-import-order
-
-
-class CourseCompleteTestCase(ModuleStoreTestCase):
-    """
-    Tests for the course completion helper functions.
-    """
-
-    def setUp(self):
-        super().setUp()
-        # Need key to be deterministic to test slugs.
-        self.course = CourseFactory.create(
-            org='edX', course='course_test', run='test_run', display_name='Badged',
-            start=datetime(year=2015, month=5, day=19),
-            end=datetime(year=2015, month=5, day=20)
-        )
-        self.course_key = self.course.location.course_key
-
-    def test_slug(self):
-        """
-        Verify slug generation is working as expected. If this test fails, the algorithm has changed, and it will cause
-        the handler to lose track of all badges it made in the past.
-        """
-        assert course_complete.course_slug(self.course_key, 'honor') ==\
-               'course-v1edxcourse_testtest_run_honor_2055051'
-        assert course_complete.course_slug(self.course_key, 'verified') ==\
-               'course-v1edxcourse_testtest_run_verified_d550ad7'
-
-    def test_dated_description(self):
-        """
-        Verify that a course with start/end dates contains a description with them.
-        """
-        assert course_complete.badge_description(self.course, 'honor') ==\
-               'Completed the course "Badged" (honor, 2015-05-19 - 2015-05-20)'
-
-    def test_self_paced_description(self):
-        """
-        Verify that a badge created for a course with no end date gets a different description.
-        """
-        self.course.end = None
-        assert course_complete.badge_description(self.course, 'honor') == 'Completed the course "Badged" (honor)'
-
-    def test_evidence_url(self):
-        """
-        Make sure the evidence URL points to the right place.
-        """
-        user = UserFactory.create()
-        cert = GeneratedCertificate.eligible_certificates.create(
-            user=user,
-            course_id=self.course_key,
-            download_uuid=uuid4(),
-            grade="0.95",
-            key='the_key',
-            distinction=True,
-            status='downloadable',
-            mode='honor',
-            name=user.profile.name,
-            verify_uuid=uuid4().hex
-        )
-        assert f'https://edx.org/certificates/{cert.verify_uuid}?evidence_visit=1' ==\
-               course_complete.evidence_url(user.id, self.course_key)
diff --git a/lms/djangoapps/badges/events/tests/test_course_meta.py b/lms/djangoapps/badges/events/tests/test_course_meta.py
deleted file mode 100644
index a4c613852907..000000000000
--- a/lms/djangoapps/badges/events/tests/test_course_meta.py
+++ /dev/null
@@ -1,184 +0,0 @@
-"""
-Tests the course meta badging events
-"""
-
-
-from unittest.mock import patch
-
-from ddt import data, ddt, unpack
-from django.conf import settings
-from django.test.utils import override_settings
-
-from common.djangoapps.student.models import CourseEnrollment
-from common.djangoapps.student.tests.factories import UserFactory
-from lms.djangoapps.badges.tests.factories import CourseEventBadgesConfigurationFactory, RandomBadgeClassFactory
-from lms.djangoapps.certificates.data import CertificateStatuses
-from lms.djangoapps.certificates.models import GeneratedCertificate
-from xmodule.modulestore.tests.django_utils import ModuleStoreTestCase  # lint-amnesty, pylint: disable=wrong-import-order
-from xmodule.modulestore.tests.factories import CourseFactory  # lint-amnesty, pylint: disable=wrong-import-order
-
-
-@ddt
-@patch.dict(settings.FEATURES, {'ENABLE_OPENBADGES': True})
-@override_settings(BADGING_BACKEND='lms.djangoapps.badges.backends.tests.dummy_backend.DummyBackend')
-class CourseEnrollmentBadgeTest(ModuleStoreTestCase):
-    """
-    Tests the event which awards badges based on number of courses a user is enrolled in.
-    """
-
-    def setUp(self):
-        super().setUp()
-        self.badge_classes = [
-            RandomBadgeClassFactory(
-                issuing_component='openedx__course'
-            ),
-            RandomBadgeClassFactory(
-                issuing_component='openedx__course'
-            ),
-            RandomBadgeClassFactory(
-                issuing_component='openedx__course'
-            ),
-        ]
-        nums = ['3', '5', '8']
-        entries = [','.join(pair) for pair in zip(nums, [badge.slug for badge in self.badge_classes])]
-        enrollment_config = '\r'.join(entries)
-        self.config = CourseEventBadgesConfigurationFactory(courses_enrolled=enrollment_config)
-
-    def test_no_match(self):
-        """
-        Make sure a badge isn't created before a user's reached any checkpoint.
-        """
-        user = UserFactory()
-        course = CourseFactory()
-        CourseEnrollment.enroll(user, course_key=course.location.course_key)
-        assert not user.badgeassertion_set.all()
-
-    @unpack
-    @data((1, 3), (2, 5), (3, 8))
-    def test_checkpoint_matches(self, checkpoint, required_badges):
-        """
-        Make sure the proper badges are awarded at the right checkpoints.
-        """
-        user = UserFactory()
-        courses = [CourseFactory() for _i in range(required_badges)]
-        for course in courses:
-            CourseEnrollment.enroll(user, course_key=course.location.course_key)
-        assertions = user.badgeassertion_set.all().order_by('id')
-        assert user.badgeassertion_set.all().count() == checkpoint
-        assert assertions[(checkpoint - 1)].badge_class == self.badge_classes[(checkpoint - 1)]
-
-
-@ddt
-@patch.dict(settings.FEATURES, {'ENABLE_OPENBADGES': True})
-@override_settings(BADGING_BACKEND='lms.djangoapps.badges.backends.tests.dummy_backend.DummyBackend')
-class CourseCompletionBadgeTest(ModuleStoreTestCase):
-    """
-    Tests the event which awards badges based on the number of courses completed.
-    """
-
-    def setUp(self):
-        super().setUp()
-        self.badge_classes = [
-            RandomBadgeClassFactory(
-                issuing_component='openedx__course'
-            ),
-            RandomBadgeClassFactory(
-                issuing_component='openedx__course'
-            ),
-            RandomBadgeClassFactory(
-                issuing_component='openedx__course'
-            ),
-        ]
-        nums = ['2', '6', '9']
-        entries = [','.join(pair) for pair in zip(nums, [badge.slug for badge in self.badge_classes])]
-        completed_config = '\r'.join(entries)
-        self.config = CourseEventBadgesConfigurationFactory.create(courses_completed=completed_config)
-        self.config.clean_fields()
-
-    def test_no_match(self):
-        """
-        Make sure a badge isn't created before a user's reached any checkpoint.
-        """
-        user = UserFactory()
-        course = CourseFactory()
-        GeneratedCertificate(
-            user=user, course_id=course.location.course_key, status=CertificateStatuses.downloadable
-        ).save()
-        assert not user.badgeassertion_set.all()
-
-    @unpack
-    @data((1, 2), (2, 6), (3, 9))
-    def test_checkpoint_matches(self, checkpoint, required_badges):
-        """
-        Make sure the proper badges are awarded at the right checkpoints.
-        """
-        user = UserFactory()
-        courses = [CourseFactory() for _i in range(required_badges)]
-        for course in courses:
-            GeneratedCertificate(
-                user=user, course_id=course.location.course_key, status=CertificateStatuses.downloadable
-            ).save()
-        assertions = user.badgeassertion_set.all().order_by('id')
-        assert user.badgeassertion_set.all().count() == checkpoint
-        assert assertions[(checkpoint - 1)].badge_class == self.badge_classes[(checkpoint - 1)]
-
-
-@patch.dict(settings.FEATURES, {'ENABLE_OPENBADGES': True})
-@override_settings(BADGING_BACKEND='lms.djangoapps.badges.backends.tests.dummy_backend.DummyBackend')
-class CourseGroupBadgeTest(ModuleStoreTestCase):
-    """
-    Tests the event which awards badges when a user completes a set of courses.
-    """
-
-    def setUp(self):
-        super().setUp()
-        self.badge_classes = [
-            RandomBadgeClassFactory(
-                issuing_component='openedx__course'
-            ),
-            RandomBadgeClassFactory(
-                issuing_component='openedx__course'
-            ),
-            RandomBadgeClassFactory(
-                issuing_component='openedx__course'
-            ),
-        ]
-        self.courses = []
-        for _badge_class in self.badge_classes:
-            self.courses.append([CourseFactory().location.course_key for _i in range(3)])  # lint-amnesty, pylint: disable=no-member
-        lines = [badge_class.slug + ',' + ','.join([str(course_key) for course_key in keys])
-                 for badge_class, keys in zip(self.badge_classes, self.courses)]
-        config = '\r'.join(lines)
-        self.config = CourseEventBadgesConfigurationFactory(course_groups=config)
-        self.config_map = dict(list(zip(self.badge_classes, self.courses)))
-
-    def test_no_match(self):
-        """
-        Make sure a badge isn't created before a user's completed any course groups.
-        """
-        user = UserFactory()
-        course = CourseFactory()
-        GeneratedCertificate(
-            user=user, course_id=course.location.course_key, status=CertificateStatuses.downloadable
-        ).save()
-        assert not user.badgeassertion_set.all()
-
-    def test_group_matches(self):
-        """
-        Make sure the proper badges are awarded when groups are completed.
-        """
-        user = UserFactory()
-        items = list(self.config_map.items())
-        for badge_class, course_keys in items:
-            for i, key in enumerate(course_keys):
-                GeneratedCertificate(
-                    user=user, course_id=key, status=CertificateStatuses.downloadable
-                ).save()
-                # We don't award badges until all three are set.
-                if i + 1 == len(course_keys):
-                    assert badge_class.get_for_user(user)
-                else:
-                    assert not badge_class.get_for_user(user)
-        classes = [badge.badge_class.id for badge in user.badgeassertion_set.all()]
-        source_classes = [badge.id for badge in self.badge_classes]
-        assert classes == source_classes
diff --git a/lms/djangoapps/badges/handlers.py b/lms/djangoapps/badges/handlers.py
deleted file mode 100644
index d65448128a32..000000000000
--- a/lms/djangoapps/badges/handlers.py
+++ /dev/null
@@ -1,20 +0,0 @@
-"""
-Badges related signal handlers.
-"""
-
-
-from django.dispatch import receiver
-
-from common.djangoapps.student.models import EnrollStatusChange
-from common.djangoapps.student.signals import ENROLL_STATUS_CHANGE
-from lms.djangoapps.badges.events.course_meta import award_enrollment_badge
-from lms.djangoapps.badges.utils import badges_enabled
-
-
-@receiver(ENROLL_STATUS_CHANGE)
-def award_badge_on_enrollment(sender, event=None, user=None, **kwargs):  # pylint: disable=unused-argument
-    """
-    Awards enrollment badge to the given user on new enrollments.
-    """
-    if badges_enabled and event == EnrollStatusChange.enroll:
-        award_enrollment_badge(user)
diff --git a/lms/djangoapps/badges/migrations/0005_delete_all_models.py b/lms/djangoapps/badges/migrations/0005_delete_all_models.py
new file mode 100644
index 000000000000..e967dc814a73
--- /dev/null
+++ b/lms/djangoapps/badges/migrations/0005_delete_all_models.py
@@ -0,0 +1,41 @@
+# Generated by Django 3.2.22 on 2023-10-24 15:01
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('badges', '0004_badgeclass_badgr_server_slug'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='badgeassertion',
+            name='badge_class',
+        ),
+        migrations.RemoveField(
+            model_name='badgeassertion',
+            name='user',
+        ),
+        migrations.AlterUniqueTogether(
+            name='badgeclass',
+            unique_together=None,
+        ),
+        migrations.DeleteModel(
+            name='CourseCompleteImageConfiguration',
+        ),
+        migrations.RemoveField(
+            model_name='courseeventbadgesconfiguration',
+            name='changed_by',
+        ),
+        migrations.DeleteModel(
+            name='BadgeAssertion',
+        ),
+        migrations.DeleteModel(
+            name='BadgeClass',
+        ),
+        migrations.DeleteModel(
+            name='CourseEventBadgesConfiguration',
+        ),
+    ]
diff --git a/lms/djangoapps/badges/models.py b/lms/djangoapps/badges/models.py
index 9af390174985..005cf1569ae1 100644
--- a/lms/djangoapps/badges/models.py
+++ b/lms/djangoapps/badges/models.py
@@ -3,24 +3,8 @@
 """
 
 
-from importlib import import_module
-
-from config_models.models import ConfigurationModel
-from django.conf import settings
-from django.contrib.auth.models import User  # lint-amnesty, pylint: disable=imported-auth-user
 from django.core.exceptions import ValidationError
-from django.db import models
 from django.utils.translation import gettext_lazy as _
-from jsonfield import JSONField
-from lazy import lazy  # lint-amnesty, pylint: disable=no-name-in-module
-from model_utils.models import TimeStampedModel
-from opaque_keys import InvalidKeyError
-from opaque_keys.edx.django.models import CourseKeyField
-from opaque_keys.edx.keys import CourseKey
-
-from lms.djangoapps.badges.utils import deserialize_count_specs
-from openedx.core.djangolib.markup import HTML, Text
-from xmodule.modulestore.django import modulestore  # lint-amnesty, pylint: disable=wrong-import-order
 
 
 def validate_badge_image(image):
@@ -39,298 +23,3 @@ def validate_lowercase(string):
     """
     if not string.islower():
         raise ValidationError(_("This value must be all lowercase."))
-
-
-class CourseBadgesDisabledError(Exception):
-    """
-    Exception raised when Course Badges aren't enabled, but an attempt to fetch one is made anyway.
-    """
-
-
-class BadgeClass(models.Model):
-    """
-    Specifies a badge class to be registered with a backend.
-
-    .. no_pii:
-    """
-    slug = models.SlugField(max_length=255, validators=[validate_lowercase])
-    badgr_server_slug = models.SlugField(max_length=255, default='', blank=True)
-    issuing_component = models.SlugField(max_length=50, default='', blank=True, validators=[validate_lowercase])
-    display_name = models.CharField(max_length=255)
-    course_id = CourseKeyField(max_length=255, blank=True, default=None)
-    description = models.TextField()
-    criteria = models.TextField()
-    # Mode a badge was awarded for. Included for legacy/migration purposes.
-    mode = models.CharField(max_length=100, default='', blank=True)
-    image = models.ImageField(upload_to='badge_classes', validators=[validate_badge_image])
-
-    def __str__(self):  # lint-amnesty, pylint: disable=invalid-str-returned
-        return HTML("<Badge '{slug}' for '{issuing_component}'>").format(
-            slug=HTML(self.slug), issuing_component=HTML(self.issuing_component)
-        )
-
-    @classmethod
-    def get_badge_class(
-            cls, slug, issuing_component, display_name=None, description=None, criteria=None, image_file_handle=None,
-            mode='', course_id=None, create=True
-    ):
-        # TODO method should be renamed to getorcreate instead
-        """
-        Looks up a badge class by its slug, issuing component, and course_id and returns it should it exist.
-        If it does not exist, and create is True, creates it according to the arguments. Otherwise, returns None.
-
-        The expectation is that an XBlock or platform developer should not need to concern themselves with whether
-        or not a badge class has already been created, but should just feed all requirements to this function
-        and it will 'do the right thing'. It should be the exception, rather than the common case, that a badge class
-        would need to be looked up without also being created were it missing.
-        """
-        slug = slug.lower()
-        issuing_component = issuing_component.lower()
-        if course_id and not modulestore().get_course(course_id).issue_badges:
-            raise CourseBadgesDisabledError("This course does not have badges enabled.")
-        if not course_id:
-            course_id = CourseKeyField.Empty
-        try:
-            return cls.objects.get(slug=slug, issuing_component=issuing_component, course_id=course_id)
-        except cls.DoesNotExist:
-            if not create:
-                return None
-        badge_class = cls(
-            slug=slug,
-            issuing_component=issuing_component,
-            display_name=display_name,
-            course_id=course_id,
-            mode=mode,
-            description=description,
-            criteria=criteria,
-        )
-        badge_class.image.save(image_file_handle.name, image_file_handle)
-        badge_class.full_clean()
-        badge_class.save()
-        return badge_class
-
-    @lazy
-    def backend(self):
-        """
-        Loads the badging backend.
-        """
-        module, klass = settings.BADGING_BACKEND.rsplit('.', 1)
-        module = import_module(module)
-        return getattr(module, klass)()
-
-    def get_for_user(self, user):
-        """
-        Get the assertion for this badge class for this user, if it has been awarded.
-        """
-        return self.badgeassertion_set.filter(user=user)
-
-    def award(self, user, evidence_url=None):
-        """
-        Contacts the backend to have a badge assertion created for this badge class for this user.
-        """
-        return self.backend.award(self, user, evidence_url=evidence_url)  # lint-amnesty, pylint: disable=no-member
-
-    def save(self, **kwargs):  # lint-amnesty, pylint: disable=arguments-differ
-        """
-        Slugs must always be lowercase.
-        """
-        self.slug = self.slug and self.slug.lower()
-        self.issuing_component = self.issuing_component and self.issuing_component.lower()
-        super().save(**kwargs)
-
-    class Meta:
-        app_label = "badges"
-        unique_together = (('slug', 'issuing_component', 'course_id'),)
-        verbose_name_plural = "Badge Classes"
-
-
-class BadgeAssertion(TimeStampedModel):
-    """
-    Tracks badges on our side of the badge baking transaction
-
-    .. no_pii:
-    """
-    user = models.ForeignKey(User, on_delete=models.CASCADE)
-    badge_class = models.ForeignKey(BadgeClass, on_delete=models.CASCADE)
-    data = JSONField()
-    backend = models.CharField(max_length=50)
-    image_url = models.URLField()
-    assertion_url = models.URLField()
-
-    def __str__(self):  # lint-amnesty, pylint: disable=invalid-str-returned
-        return HTML("<{username} Badge Assertion for {slug} for {issuing_component}").format(
-            username=HTML(self.user.username),
-            slug=HTML(self.badge_class.slug),
-            issuing_component=HTML(self.badge_class.issuing_component),
-        )
-
-    @classmethod
-    def assertions_for_user(cls, user, course_id=None):
-        """
-        Get all assertions for a user, optionally constrained to a course.
-        """
-        if course_id:
-            return cls.objects.filter(user=user, badge_class__course_id=course_id)
-        return cls.objects.filter(user=user)
-
-    class Meta:
-        app_label = "badges"
-
-
-# Abstract model doesn't index this, so we have to.
-BadgeAssertion._meta.get_field('created').db_index = True
-
-
-class CourseCompleteImageConfiguration(models.Model):
-    """
-    Contains the icon configuration for badges for a specific course mode.
-
-    .. no_pii:
-    """
-    mode = models.CharField(
-        max_length=125,
-        help_text=_('The course mode for this badge image. For example, "verified" or "honor".'),
-        unique=True,
-    )
-    icon = models.ImageField(
-        # Actual max is 256KB, but need overhead for badge baking. This should be more than enough.
-        help_text=_(
-            "Badge images must be square PNG files. The file size should be under 250KB."
-        ),
-        upload_to='course_complete_badges',
-        validators=[validate_badge_image]
-    )
-    default = models.BooleanField(
-        help_text=_(
-            "Set this value to True if you want this image to be the default image for any course modes "
-            "that do not have a specified badge image. You can have only one default image."
-        ),
-        default=False,
-    )
-
-    def __str__(self):  # lint-amnesty, pylint: disable=invalid-str-returned
-        return HTML("<CourseCompleteImageConfiguration for '{mode}'{default}>").format(
-            mode=HTML(self.mode),
-            default=HTML(" (default)") if self.default else HTML('')
-        )
-
-    def clean(self):
-        """
-        Make sure there's not more than one default.
-        """
-        if self.default and CourseCompleteImageConfiguration.objects.filter(default=True).exclude(id=self.id):
-            raise ValidationError(_("There can be only one default image."))
-
-    @classmethod
-    def image_for_mode(cls, mode):
-        """
-        Get the image for a particular mode.
-        """
-        try:
-            return cls.objects.get(mode=mode).icon
-        except cls.DoesNotExist:
-            # Fall back to default, if there is one.
-            return cls.objects.get(default=True).icon
-
-    class Meta:
-        app_label = "badges"
-
-
-class CourseEventBadgesConfiguration(ConfigurationModel):
-    """
-    Determines the settings for meta course awards-- such as completing a certain
-    number of courses or enrolling in a certain number of them.
-
-    .. no_pii:
-    """
-    courses_completed = models.TextField(
-        blank=True, default='',
-        help_text=_(
-            "On each line, put the number of completed courses to award a badge for, a comma, and the slug of a "
-            "badge class you have created that has the issuing component 'openedx__course'. "
-            "For example: 3,enrolled_3_courses"
-        )
-    )
-    courses_enrolled = models.TextField(
-        blank=True, default='',
-        help_text=_(
-            "On each line, put the number of enrolled courses to award a badge for, a comma, and the slug of a "
-            "badge class you have created that has the issuing component 'openedx__course'. "
-            "For example: 3,enrolled_3_courses"
-        )
-    )
-    course_groups = models.TextField(
-        blank=True, default='',
-        help_text=_(
-            "Each line is a comma-separated list. The first item in each line is the slug of a badge class you "
-            "have created that has an issuing component of 'openedx__course'. The remaining items in each line are "
-            "the course keys the learner needs to complete to be awarded the badge. For example: "
-            "slug_for_compsci_courses_group_badge,course-v1:CompSci+Course+First,course-v1:CompsSci+Course+Second"
-        )
-    )
-
-    def __str__(self):  # lint-amnesty, pylint: disable=invalid-str-returned
-        return HTML("<CourseEventBadgesConfiguration ({})>").format(
-            Text("Enabled") if self.enabled else Text("Disabled")
-        )
-
-    @property
-    def completed_settings(self):
-        """
-        Parses the settings from the courses_completed field.
-        """
-        return deserialize_count_specs(self.courses_completed)
-
-    @property
-    def enrolled_settings(self):
-        """
-        Parses the settings from the courses_completed field.
-        """
-        return deserialize_count_specs(self.courses_enrolled)
-
-    @property
-    def course_group_settings(self):
-        """
-        Parses the course group settings. In example, the format is:
-
-        slug_for_compsci_courses_group_badge,course-v1:CompSci+Course+First,course-v1:CompsSci+Course+Second
-        """
-        specs = self.course_groups.strip()
-        if not specs:
-            return {}
-        specs = [line.split(',', 1) for line in specs.splitlines()]
-        return {
-            slug.strip().lower(): [CourseKey.from_string(key.strip()) for key in keys.strip().split(',')]
-            for slug, keys in specs
-        }
-
-    def clean_fields(self, exclude=tuple()):
-        """
-        Verify the settings are parseable.
-        """
-        errors = {}
-        error_message = _("Please check the syntax of your entry.")
-        if 'courses_completed' not in exclude:
-            try:
-                self.completed_settings
-            except (ValueError, InvalidKeyError):
-                errors['courses_completed'] = [str(error_message)]
-        if 'courses_enrolled' not in exclude:
-            try:
-                self.enrolled_settings
-            except (ValueError, InvalidKeyError):
-                errors['courses_enrolled'] = [str(error_message)]
-        if 'course_groups' not in exclude:
-            store = modulestore()
-            try:
-                for key_list in self.course_group_settings.values():
-                    for course_key in key_list:
-                        if not store.get_course(course_key):
-                            ValueError(f"The course {course_key} does not exist.")
-            except (ValueError, InvalidKeyError):
-                errors['course_groups'] = [str(error_message)]
-        if errors:
-            raise ValidationError(errors)
-
-    class Meta:
-        app_label = "badges"
diff --git a/lms/djangoapps/badges/service.py b/lms/djangoapps/badges/service.py
deleted file mode 100644
index 2870ac7df4f9..000000000000
--- a/lms/djangoapps/badges/service.py
+++ /dev/null
@@ -1,30 +0,0 @@
-"""
-Badging service for XBlocks
-"""
-
-
-from lms.djangoapps.badges.models import BadgeClass
-
-
-class BadgingService:
-    """
-    A class that provides functions for managing badges which XBlocks can use.
-
-    If course_enabled is True, course-level badges are permitted for this course.
-
-    If it is False, any badges that are awarded should be non-course specific.
-    """
-    course_badges_enabled = False
-
-    def __init__(self, course_id=None, modulestore=None):
-        """
-        Sets the 'course_badges_enabled' parameter.
-        """
-        if not (course_id and modulestore):
-            return
-
-        course = modulestore.get_course(course_id)
-        if course:
-            self.course_badges_enabled = course.issue_badges
-
-    get_badge_class = BadgeClass.get_badge_class
diff --git a/lms/djangoapps/badges/tests/__init__.py b/lms/djangoapps/badges/tests/__init__.py
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/lms/djangoapps/badges/tests/factories.py b/lms/djangoapps/badges/tests/factories.py
deleted file mode 100644
index f84053e3298e..000000000000
--- a/lms/djangoapps/badges/tests/factories.py
+++ /dev/null
@@ -1,88 +0,0 @@
-"""
-Factories for Badge tests
-"""
-
-
-from random import random
-
-import factory
-from django.core.files.base import ContentFile
-from factory.django import ImageField
-
-from common.djangoapps.student.tests.factories import UserFactory
-from lms.djangoapps.badges.models import (  # lint-amnesty, pylint: disable=line-too-long
-    BadgeAssertion,
-    BadgeClass,
-    CourseCompleteImageConfiguration,
-    CourseEventBadgesConfiguration
-)
-
-
-def generate_dummy_image(_unused):
-    """
-    Used for image fields to create a sane default.
-    """
-    return ContentFile(
-        ImageField()._make_data(  # pylint: disable=protected-access
-            {'color': 'blue', 'width': 50, 'height': 50, 'format': 'PNG'}
-        ), 'test.png'
-    )
-
-
-class CourseCompleteImageConfigurationFactory(factory.django.DjangoModelFactory):
-    """
-    Factory for BadgeImageConfigurations
-    """
-    class Meta:
-        model = CourseCompleteImageConfiguration
-
-    mode = 'honor'
-    icon = factory.LazyAttribute(generate_dummy_image)
-
-
-class BadgeClassFactory(factory.django.DjangoModelFactory):
-    """
-    Factory for BadgeClass
-    """
-    class Meta:
-        model = BadgeClass
-
-    slug = 'test_slug'
-    badgr_server_slug = 'test_badgr_server_slug'
-    issuing_component = 'test_component'
-    display_name = 'Test Badge'
-    description = "Yay! It's a test badge."
-    criteria = 'https://example.com/syllabus'
-    mode = 'honor'
-    image = factory.LazyAttribute(generate_dummy_image)
-
-
-class RandomBadgeClassFactory(BadgeClassFactory):
-    """
-    Same as BadgeClassFactory, but randomize the slug.
-    """
-    slug = factory.lazy_attribute(lambda _: 'test_slug_' + str(random()).replace('.', '_'))
-
-
-class BadgeAssertionFactory(factory.django.DjangoModelFactory):
-    """
-    Factory for BadgeAssertions
-    """
-    class Meta:
-        model = BadgeAssertion
-
-    user = factory.SubFactory(UserFactory)
-    badge_class = factory.SubFactory(RandomBadgeClassFactory)
-    data = {}
-    assertion_url = 'http://example.com/example.json'
-    image_url = 'http://example.com/image.png'
-
-
-class CourseEventBadgesConfigurationFactory(factory.django.DjangoModelFactory):
-    """
-    Factory for CourseEventsBadgesConfiguration
-    """
-    class Meta:
-        model = CourseEventBadgesConfiguration
-
-    enabled = True
diff --git a/lms/djangoapps/badges/tests/test_models.py b/lms/djangoapps/badges/tests/test_models.py
deleted file mode 100644
index e57c2e1b2363..000000000000
--- a/lms/djangoapps/badges/tests/test_models.py
+++ /dev/null
@@ -1,311 +0,0 @@
-"""
-Tests for the Badges app models.
-"""
-
-
-import contextlib
-from unittest.mock import Mock, patch
-
-import pytest
-from django.core.exceptions import ValidationError
-from django.core.files.images import ImageFile
-from django.core.files.storage import default_storage
-from django.db.utils import IntegrityError
-from django.test import TestCase
-from django.test.utils import override_settings
-from path import Path
-
-from common.djangoapps.student.tests.factories import UserFactory
-from lms.djangoapps.badges.models import (
-    BadgeAssertion,
-    BadgeClass,
-    CourseBadgesDisabledError,
-    CourseCompleteImageConfiguration,
-    validate_badge_image
-)
-from lms.djangoapps.badges.tests.factories import BadgeAssertionFactory, BadgeClassFactory, RandomBadgeClassFactory
-from lms.djangoapps.certificates.tests.test_models import TEST_DATA_ROOT, TEST_DATA_DIR
-from xmodule.modulestore.tests.django_utils import ModuleStoreTestCase  # lint-amnesty, pylint: disable=wrong-import-order
-from xmodule.modulestore.tests.factories import CourseFactory  # lint-amnesty, pylint: disable=wrong-import-order
-
-
-@contextlib.contextmanager
-def get_image(name):
-    """
-    Get one of the test images from the test data directory.
-    """
-    with open(f'{TEST_DATA_DIR}/badges/{name}.png', mode='rb') as fimage:
-        yield ImageFile(fimage)
-
-
-@override_settings(MEDIA_ROOT=TEST_DATA_ROOT)
-class BadgeImageConfigurationTest(TestCase):
-    """
-    Test the validation features of BadgeImageConfiguration.
-    """
-
-    def tearDown(self):  # lint-amnesty, pylint: disable=super-method-not-called
-        tmp_path = Path(TEST_DATA_ROOT / 'course_complete_badges')
-        Path.rmtree_p(tmp_path)
-
-    def test_no_double_default(self):
-        """
-        Verify that creating two configurations as default is not permitted.
-        """
-        with get_image('good') as image_handle:
-            CourseCompleteImageConfiguration(mode='test', icon=ImageFile(image_handle), default=True).save()
-        with get_image('good') as image_handle:
-            pytest.raises(ValidationError, CourseCompleteImageConfiguration(mode='test2', icon=ImageFile(image_handle),
-                                                                            default=True).full_clean)
-
-    def test_runs_validator(self):
-        """
-        Verify that the image validator is triggered when cleaning the model.
-        """
-        with get_image('unbalanced') as image_handle:
-            pytest.raises(
-                ValidationError,
-                CourseCompleteImageConfiguration(mode='test2', icon=ImageFile(image_handle)).full_clean
-            )
-
-
-class DummyBackend:
-    """
-    Dummy badge backend, used for testing.
-    """
-    award = Mock()
-
-
-@override_settings(MEDIA_ROOT=TEST_DATA_ROOT)
-class BadgeClassTest(ModuleStoreTestCase):
-    """
-    Test BadgeClass functionality
-    """
-
-    def setUp(self):
-        super().setUp()
-        self.addCleanup(self.cleanup_uploads)
-
-    def cleanup_uploads(self):
-        """
-        Remove all files uploaded as badges.
-        """
-        upload_to = BadgeClass._meta.get_field('image').upload_to
-        if default_storage.exists(upload_to):
-            (_, files) = default_storage.listdir(upload_to)
-            for uploaded_file in files:
-                default_storage.delete(upload_to + '/' + uploaded_file)
-
-    # Need full path to make sure class names line up.
-    @override_settings(BADGING_BACKEND='lms.djangoapps.badges.tests.test_models.DummyBackend')
-    def test_backend(self):
-        """
-        Verify the BadgeClass fetches the backend properly.
-        """
-        assert isinstance(BadgeClass().backend, DummyBackend)
-
-    def test_get_badge_class_preexisting(self):
-        """
-        Verify fetching a badge first grabs existing badges.
-        """
-        premade_badge_class = BadgeClassFactory.create()
-        # Ignore additional parameters. This class already exists.
-        with get_image('good') as image_handle:
-            badge_class = BadgeClass.get_badge_class(
-                slug='test_slug', issuing_component='test_component', description='Attempted override',
-                criteria='test', display_name='Testola', image_file_handle=image_handle
-            )
-        # These defaults are set on the factory.
-        assert badge_class.criteria == 'https://example.com/syllabus'
-        assert badge_class.display_name == 'Test Badge'
-        assert badge_class.description == "Yay! It's a test badge."
-        # File name won't always be the same.
-        assert badge_class.image.path == premade_badge_class.image.path
-
-    def test_unique_for_course(self):
-        """
-        Verify that the course_id is used in fetching existing badges or creating new ones.
-        """
-        course_key = CourseFactory.create().location.course_key
-        premade_badge_class = BadgeClassFactory.create(course_id=course_key)
-        with get_image('good') as image_handle:
-            badge_class = BadgeClass.get_badge_class(
-                slug='test_slug', issuing_component='test_component', description='Attempted override',
-                criteria='test', display_name='Testola', image_file_handle=image_handle
-            )
-        with get_image('good') as image_handle:
-            course_badge_class = BadgeClass.get_badge_class(
-                slug='test_slug', issuing_component='test_component', description='Attempted override',
-                criteria='test', display_name='Testola', image_file_handle=image_handle,
-                course_id=course_key,
-            )
-        assert badge_class.id != course_badge_class.id
-        assert course_badge_class.id == premade_badge_class.id
-
-    def test_get_badge_class_course_disabled(self):
-        """
-        Verify attempting to fetch a badge class for a course which does not issue badges raises an
-        exception.
-        """
-        course_key = CourseFactory.create(metadata={'issue_badges': False}).location.course_key
-        with pytest.raises(CourseBadgesDisabledError):
-            with get_image('good') as image_handle:
-                BadgeClass.get_badge_class(
-                    slug='test_slug', issuing_component='test_component', description='Attempted override',
-                    criteria='test', display_name='Testola', image_file_handle=image_handle,
-                    course_id=course_key,
-                )
-
-    def test_get_badge_class_create(self):
-        """
-        Verify fetching a badge creates it if it doesn't yet exist.
-        """
-        with get_image('good') as image_handle:
-            badge_class = BadgeClass.get_badge_class(
-                slug='new_slug', issuing_component='new_component', description='This is a test',
-                criteria='https://example.com/test_criteria', display_name='Super Badge',
-                image_file_handle=image_handle
-            )
-        # This should have been saved before being passed back.
-        assert badge_class.id
-        assert badge_class.slug == 'new_slug'
-        assert badge_class.issuing_component == 'new_component'
-        assert badge_class.description == 'This is a test'
-        assert badge_class.criteria == 'https://example.com/test_criteria'
-        assert badge_class.display_name == 'Super Badge'
-        assert 'good' in badge_class.image.name.rsplit('/', 1)[(- 1)]
-
-    def test_get_badge_class_nocreate(self):
-        """
-        Test returns None if the badge class does not exist.
-        """
-        badge_class = BadgeClass.get_badge_class(
-            slug='new_slug', issuing_component='new_component', create=False
-        )
-        assert badge_class is None
-        # Run this twice to verify there wasn't a background creation of the badge.
-        badge_class = BadgeClass.get_badge_class(
-            slug='new_slug', issuing_component='new_component', description=None,
-            criteria=None, display_name=None,
-            image_file_handle=None, create=False
-        )
-        assert badge_class is None
-
-    def test_get_badge_class_image_validate(self):
-        """
-        Verify handing a broken image to get_badge_class raises a validation error upon creation.
-        """
-        # TODO Test should be updated, this doc doesn't makes sense, the object eventually gets created
-        with get_image('unbalanced') as image_handle:
-            self.assertRaises(
-                ValidationError,
-                BadgeClass.get_badge_class,
-                slug='new_slug', issuing_component='new_component', description='This is a test',
-                criteria='https://example.com/test_criteria', display_name='Super Badge',
-                image_file_handle=image_handle
-            )
-
-    def test_get_badge_class_data_validate(self):
-        """
-        Verify handing incomplete data for required fields when making a badge class raises an Integrity error.
-        """
-        with pytest.raises(IntegrityError), self.allow_transaction_exception():
-            with get_image('good') as image_handle:
-                BadgeClass.get_badge_class(
-                    slug='new_slug', issuing_component='new_component', image_file_handle=image_handle
-                )
-
-    def test_get_for_user(self):
-        """
-        Make sure we can get an assertion for a user if there is one.
-        """
-        user = UserFactory.create()
-        badge_class = BadgeClassFactory.create()
-        assert not badge_class.get_for_user(user)
-        assertion = BadgeAssertionFactory.create(badge_class=badge_class, user=user)
-        assert list(badge_class.get_for_user(user)) == [assertion]
-
-    @override_settings(
-        BADGING_BACKEND='lms.djangoapps.badges.backends.badgr.BadgrBackend',
-        BADGR_USERNAME='example@example.com',
-        BADGR_PASSWORD='password',
-        BADGR_TOKENS_CACHE_KEY='badgr-test-cache-key')
-    @patch('lms.djangoapps.badges.backends.badgr.BadgrBackend.award')
-    def test_award(self, mock_award):
-        """
-        Verify that the award command calls the award function on the backend with the right parameters.
-        """
-        user = UserFactory.create()
-        badge_class = BadgeClassFactory.create()
-        badge_class.award(user, evidence_url='http://example.com/evidence')
-        assert mock_award.called
-        mock_award.assert_called_with(badge_class, user, evidence_url='http://example.com/evidence')
-
-    def test_runs_validator(self):
-        """
-        Verify that the image validator is triggered when cleaning the model.
-        """
-        with get_image('unbalanced') as image_handle:
-            pytest.raises(
-                ValidationError,
-                BadgeClass(
-                    slug='test', issuing_component='test2', criteria='test3',
-                    description='test4', image=ImageFile(image_handle)).full_clean
-            )
-
-
-class BadgeAssertionTest(ModuleStoreTestCase):
-    """
-    Tests for the BadgeAssertion model
-    """
-    def test_assertions_for_user(self):
-        """
-        Verify that grabbing all assertions for a user behaves as expected.
-
-        This function uses object IDs because for some reason Jenkins trips up
-        on its assertCountEqual check here despite the items being equal.
-        """
-        user = UserFactory()
-        assertions = [BadgeAssertionFactory.create(user=user).id for _i in range(3)]
-        course = CourseFactory.create()
-        course_key = course.location.course_key
-        course_badges = [RandomBadgeClassFactory(course_id=course_key) for _i in range(3)]
-        course_assertions = [
-            BadgeAssertionFactory.create(user=user, badge_class=badge_class).id for badge_class in course_badges
-        ]
-        assertions.extend(course_assertions)
-        assertions.sort()
-        assertions_for_user = [badge.id for badge in BadgeAssertion.assertions_for_user(user)]
-        assertions_for_user.sort()
-        assert assertions_for_user == assertions
-        course_scoped_assertions = [
-            badge.id for badge in BadgeAssertion.assertions_for_user(user, course_id=course_key)
-        ]
-        course_scoped_assertions.sort()
-        assert course_scoped_assertions == course_assertions
-
-
-class ValidBadgeImageTest(TestCase):
-    """
-    Tests the badge image field validator.
-    """
-    def test_good_image(self):
-        """
-        Verify that saving a valid badge image is no problem.
-        """
-        with get_image('good') as image_handle:
-            validate_badge_image(ImageFile(image_handle))
-
-    def test_unbalanced_image(self):
-        """
-        Verify that setting an image with an uneven width and height raises an error.
-        """
-        with get_image('unbalanced') as image_handle:
-            self.assertRaises(ValidationError, validate_badge_image, ImageFile(image_handle))
-
-    def test_large_image(self):
-        """
-        Verify that setting an image that is too big raises an error.
-        """
-        with get_image('large') as image_handle:
-            self.assertRaises(ValidationError, validate_badge_image, ImageFile(image_handle))
diff --git a/lms/djangoapps/badges/utils.py b/lms/djangoapps/badges/utils.py
deleted file mode 100644
index 150834e04cdb..000000000000
--- a/lms/djangoapps/badges/utils.py
+++ /dev/null
@@ -1,48 +0,0 @@
-"""
-Utility functions used by the badging app.
-"""
-
-
-from django.conf import settings
-
-
-def site_prefix():
-    """
-    Get the prefix for the site URL-- protocol and server name.
-    """
-    scheme = "https" if settings.HTTPS == "on" else "http"
-    return f'{scheme}://{settings.SITE_NAME}'
-
-
-def requires_badges_enabled(function):
-    """
-    Decorator that bails a function out early if badges aren't enabled.
-    """
-    def wrapped(*args, **kwargs):
-        """
-        Wrapped function which bails out early if bagdes aren't enabled.
-        """
-        if not badges_enabled():
-            return
-        return function(*args, **kwargs)
-    return wrapped
-
-
-def badges_enabled():
-    """
-    returns a boolean indicating whether or not openbadges are enabled.
-    """
-    return settings.FEATURES.get('ENABLE_OPENBADGES', False)
-
-
-def deserialize_count_specs(text):
-    """
-    Takes a string in the format of:
-        int,course_key
-        int,course_key
-
-    And returns a dictionary with the keys as the numbers and the values as the course keys.
-    """
-    specs = text.splitlines()
-    specs = [line.split(',') for line in specs if line.strip()]
-    return {int(num): slug.strip().lower() for num, slug in specs}
diff --git a/lms/djangoapps/bulk_email/tests/test_course_optout.py b/lms/djangoapps/bulk_email/tests/test_course_optout.py
index a618545bcd68..fe0f70fbdc3b 100644
--- a/lms/djangoapps/bulk_email/tests/test_course_optout.py
+++ b/lms/djangoapps/bulk_email/tests/test_course_optout.py
@@ -40,7 +40,7 @@ def setUp(self):
         # load initial content (since we don't run migrations as part of tests):
         call_command("loaddata", "course_email_template.json")
 
-        self.client.login(username=self.student.username, password="test")
+        self.client.login(username=self.student.username, password=self.TEST_PASSWORD)
 
         self.send_mail_url = reverse('send_email', kwargs={'course_id': str(self.course.id)})
         self.success_content = {
@@ -70,7 +70,7 @@ def test_optout_course(self):
 
         self.client.logout()
 
-        self.client.login(username=self.instructor.username, password="test")
+        self.client.login(username=self.instructor.username, password=self.TEST_PASSWORD)
         self.navigate_to_email_view()
 
         test_email = {
@@ -92,7 +92,7 @@ def test_optout_using_unsubscribe_link_in_email(self):
         """
         self.client.logout()
 
-        self.client.login(username=self.instructor.username, password="test")
+        self.client.login(username=self.instructor.username, password=self.TEST_PASSWORD)
 
         unsubscribe_link = get_unsubscribed_link(self.student.username, str(self.course.id))
         response = self.client.post(unsubscribe_link, {'unsubscribe': True})
@@ -122,7 +122,7 @@ def test_optin_course(self):
 
         assert CourseEnrollment.is_enrolled(self.student, self.course.id)
 
-        self.client.login(username=self.instructor.username, password="test")
+        self.client.login(username=self.instructor.username, password=self.TEST_PASSWORD)
         self.navigate_to_email_view()
 
         test_email = {
@@ -155,7 +155,7 @@ def setUp(self):
         self.student = UserFactory.create()
         CourseEnrollmentFactory.create(user=self.student, course_id=self.course.id)
 
-        self.client.login(username=self.student.username, password="test")
+        self.client.login(username=self.student.username, password=self.TEST_PASSWORD)
 
         self._set_email_optout(False)
         self.policy = CourseEmailOptout()
diff --git a/lms/djangoapps/bulk_email/tests/test_email.py b/lms/djangoapps/bulk_email/tests/test_email.py
index b67864381bfa..ba95bd26ddda 100644
--- a/lms/djangoapps/bulk_email/tests/test_email.py
+++ b/lms/djangoapps/bulk_email/tests/test_email.py
@@ -87,7 +87,7 @@ def login_as_user(self, user):
         """
         Log in self.client as user.
         """
-        self.client.login(username=user.username, password="test")
+        self.client.login(username=user.username, password=self.TEST_PASSWORD)
 
     def goto_instructor_dash_email_view(self):
         """
diff --git a/lms/djangoapps/bulk_email/tests/test_err_handling.py b/lms/djangoapps/bulk_email/tests/test_err_handling.py
index 3f3ffe9b6977..06e9a1dce40f 100644
--- a/lms/djangoapps/bulk_email/tests/test_err_handling.py
+++ b/lms/djangoapps/bulk_email/tests/test_err_handling.py
@@ -53,7 +53,7 @@ def setUp(self):
         course_title = "ẗëṡẗ title ｲ乇丂ｲ ﾶ乇丂丂ﾑg乇 ｷo尺 ﾑﾚﾚ тэѕт мэѕѕаБэ"
         self.course = CourseFactory.create(display_name=course_title)
         self.instructor = AdminFactory.create()
-        self.client.login(username=self.instructor.username, password="test")
+        self.client.login(username=self.instructor.username, password=self.TEST_PASSWORD)
 
         # load initial content (since we don't run migrations as part of tests):
         call_command("loaddata", "course_email_template.json")
diff --git a/lms/djangoapps/bulk_email/tests/test_signals.py b/lms/djangoapps/bulk_email/tests/test_signals.py
index ea369fa80524..1a3715284b12 100644
--- a/lms/djangoapps/bulk_email/tests/test_signals.py
+++ b/lms/djangoapps/bulk_email/tests/test_signals.py
@@ -33,7 +33,7 @@ def setUp(self):
         # load initial content (since we don't run migrations as part of tests):
         call_command("loaddata", "course_email_template.json")
 
-        self.client.login(username=self.student.username, password="test")
+        self.client.login(username=self.student.username, password=self.TEST_PASSWORD)
 
         self.send_mail_url = reverse('send_email', kwargs={'course_id': str(self.course.id)})
         self.success_content = {
@@ -78,7 +78,7 @@ def test_optout_course(self):
         force_optout_all(sender=self.__class__, user=self.student)
 
         # Try to send a bulk course email
-        self.client.login(username=self.instructor.username, password="test")
+        self.client.login(username=self.instructor.username, password=self.TEST_PASSWORD)
         self.send_test_email()
 
         # Assert that self.student.email not in mail.to, outbox should only contain "myself" target
diff --git a/lms/djangoapps/ccx/api/v0/tests/test_views.py b/lms/djangoapps/ccx/api/v0/tests/test_views.py
index d3daf72244cf..7279b9426347 100644
--- a/lms/djangoapps/ccx/api/v0/tests/test_views.py
+++ b/lms/djangoapps/ccx/api/v0/tests/test_views.py
@@ -33,7 +33,7 @@
 from lms.djangoapps.instructor.enrollment import enroll_email, get_email_params
 from openedx.core.lib.courses import get_course_by_id
 
-USER_PASSWORD = 'test'
+USER_PASSWORD = 'Password1234'
 
 
 class CcxRestApiTest(CcxTestCase, APITestCase):
@@ -760,7 +760,7 @@ def test_authorization_no_oauth_staff(self):
         """
         # create a staff user
         staff_user = UserFactory.create(
-            username='test_staff_user', email='test_staff_user@openedx.org', password='test',
+            username='test_staff_user', email='test_staff_user@openedx.org', password=USER_PASSWORD,
         )
         # add staff role to the staff user
         CourseStaffRole(self.master_course_key).add_users(staff_user)
@@ -779,7 +779,7 @@ def test_authorization_no_oauth_instructor(self):
         """
         # create an instructor user
         instructor_user = UserFactory.create(
-            username='test_instructor_user', email='test_instructor_user@openedx.org', password='test',
+            username='test_instructor_user', email='test_instructor_user@openedx.org', password=USER_PASSWORD,
         )
         # add instructor role to the instructor user
         CourseInstructorRole(self.master_course_key).add_users(instructor_user)
@@ -798,7 +798,7 @@ def test_authorization_no_oauth_other_coach(self):
         """
         # create an coach user
         coach_user = UserFactory.create(
-            username='test_coach_user', email='test_coach_user@openedx.org', password='test',
+            username='test_coach_user', email='test_coach_user@openedx.org', password=USER_PASSWORD,
         )
         # add coach role to the coach user
         CourseCcxCoachRole(self.master_course_key).add_users(coach_user)
diff --git a/lms/djangoapps/ccx/tests/test_views.py b/lms/djangoapps/ccx/tests/test_views.py
index b18ed5c2aae1..e993d5dc0b7b 100644
--- a/lms/djangoapps/ccx/tests/test_views.py
+++ b/lms/djangoapps/ccx/tests/test_views.py
@@ -129,13 +129,14 @@ def setUp(self):
         ccx = self.make_ccx()
         ccx_key = CCXLocator.from_course_locator(self.course.id, ccx.id)
         self.url = reverse('ccx_coach_dashboard', kwargs={'course_id': ccx_key})
+        self.TEST_PASSWORD = 'Password1234'
 
     def test_staff_access_coach_dashboard(self):
         """
         User is staff, should access coach dashboard.
         """
         staff = self.make_staff()
-        self.client.login(username=staff.username, password="test")
+        self.client.login(username=staff.username, password=self.TEST_PASSWORD)
 
         response = self.client.get(self.url)
         assert response.status_code == 200
@@ -145,7 +146,7 @@ def test_instructor_access_coach_dashboard(self):
         User is instructor, should access coach dashboard.
         """
         instructor = self.make_instructor()
-        self.client.login(username=instructor.username, password="test")
+        self.client.login(username=instructor.username, password=self.TEST_PASSWORD)
 
         # Now access URL
         response = self.client.get(self.url)
@@ -155,8 +156,8 @@ def test_forbidden_user_access_coach_dashboard(self):
         """
         Assert user with no access must not see dashboard.
         """
-        user = UserFactory.create(password="test")
-        self.client.login(username=user.username, password="test")
+        user = UserFactory.create(password=self.TEST_PASSWORD)
+        self.client.login(username=user.username, password=self.TEST_PASSWORD)
         response = self.client.get(self.url)
         assert response.status_code == 403
 
@@ -211,12 +212,12 @@ def assert_progress_summary(self, ccx_course_key, due):
         """
         assert signal and schedule update.
         """
-        student = UserFactory.create(is_staff=False, password="test")
+        student = UserFactory.create(is_staff=False, password=self.TEST_PASSWORD)
         CourseEnrollment.enroll(student, ccx_course_key)
         assert CourseEnrollment.objects.filter(course_id=ccx_course_key, user=student).exists()
 
         # login as student
-        self.client.login(username=student.username, password="test")
+        self.client.login(username=student.username, password=self.TEST_PASSWORD)
         progress_page_response = self.client.get(
             reverse('progress', kwargs={'course_id': ccx_course_key})
         )
@@ -236,7 +237,7 @@ def test_edit_schedule(self):
         self.make_coach()
         ccx = self.make_ccx()
         ccx_course_key = CCXLocator.from_course_locator(self.course.id, str(ccx.id))
-        self.client.login(username=self.coach.username, password="test")
+        self.client.login(username=self.coach.username, password=self.TEST_PASSWORD)
 
         url = reverse('ccx_coach_dashboard', kwargs={'course_id': ccx_course_key})
         response = self.client.get(url)
@@ -295,7 +296,7 @@ def setUp(self):
         """
         super().setUp()
         # Login with the instructor account
-        self.client.login(username=self.coach.username, password="test")
+        self.client.login(username=self.coach.username, password=self.TEST_PASSWORD)
 
         # adding staff to master course.
         staff = UserFactory()
@@ -315,8 +316,8 @@ def test_not_a_coach(self):
         ccx = self.make_ccx()
 
         # create session of non-coach user
-        user = UserFactory.create(password="test")
-        self.client.login(username=user.username, password="test")
+        user = UserFactory.create(password=self.TEST_PASSWORD)
+        self.client.login(username=user.username, password=self.TEST_PASSWORD)
         url = reverse(
             'ccx_coach_dashboard',
             kwargs={'course_id': CCXLocator.from_course_locator(self.course.id, ccx.id)})
@@ -841,7 +842,7 @@ def setUp(self):
         self.mstore = modulestore()
 
         # Login with the instructor account
-        self.client.login(username=self.coach.username, password="test")
+        self.client.login(username=self.coach.username, password=self.TEST_PASSWORD)
 
         # adding staff to master course.
         staff = UserFactory()
@@ -981,7 +982,7 @@ def setUp(self):
 
         # Create instructor account
         self.coach = coach = AdminFactory.create()
-        self.client.login(username=coach.username, password="test")
+        self.client.login(username=coach.username, password=self.TEST_PASSWORD)
 
         # Create CCX
         role = CourseCcxCoachRole(self._course.id)
@@ -1009,7 +1010,7 @@ def setUp(self):
         self.course = get_course_by_id(self.ccx_key, depth=None)
         CourseOverview.load_from_module_store(self.course.id)
         setup_students_and_grades(self)
-        self.client.login(username=coach.username, password="test")
+        self.client.login(username=coach.username, password=self.TEST_PASSWORD)
         self.addCleanup(RequestCache.clear_all_namespaces)
         from xmodule.modulestore.django import SignalHandler
 
@@ -1068,7 +1069,7 @@ def test_student_progress(self):
         get_course.return_value = self.course
         self.addCleanup(patch_context.stop)
 
-        self.client.login(username=self.student.username, password="test")  # lint-amnesty, pylint: disable=no-member
+        self.client.login(username=self.student.username, password=self.TEST_PASSWORD)  # lint-amnesty, pylint: disable=no-member
         url = reverse(
             'progress',
             kwargs={'course_id': self.ccx_key}
@@ -1194,7 +1195,7 @@ def setUp(self):
 
         # Create a Split Mongo course and enroll a student user in it.
         self.student_password = "foobar"
-        self.student = UserFactory.create(username="test", password=self.student_password, is_staff=False)
+        self.student = UserFactory.create(username=self.TEST_PASSWORD, password=self.student_password, is_staff=False)
         self.split_course = SampleCourseFactory.create(default_store=ModuleStoreEnum.Type.split)
         CourseEnrollment.enroll(self.student, self.split_course.id)
 
diff --git a/lms/djangoapps/ccx/tests/utils.py b/lms/djangoapps/ccx/tests/utils.py
index 4d36353b9a75..4f8c34e14c2d 100644
--- a/lms/djangoapps/ccx/tests/utils.py
+++ b/lms/djangoapps/ccx/tests/utils.py
@@ -68,7 +68,7 @@ def setUp(self):
         """
         super().setUp()
         # Create instructor account
-        self.coach = UserFactory.create(password="test")
+        self.coach = UserFactory.create()
         # create an instance of modulestore
         self.mstore = modulestore()
 
@@ -76,7 +76,7 @@ def make_staff(self):
         """
         create staff user.
         """
-        staff = UserFactory.create(password="test")
+        staff = UserFactory.create()
         role = CourseStaffRole(self.course.id)
         role.add_users(staff)
 
@@ -86,7 +86,7 @@ def make_instructor(self):
         """
         create instructor user.
         """
-        instructor = UserFactory.create(password="test")
+        instructor = UserFactory.create()
         role = CourseInstructorRole(self.course.id)
         role.add_users(instructor)
 
diff --git a/lms/djangoapps/certificates/config.py b/lms/djangoapps/certificates/config.py
index 6df62ae563b1..1a5fd387581b 100644
--- a/lms/djangoapps/certificates/config.py
+++ b/lms/djangoapps/certificates/config.py
@@ -2,8 +2,7 @@
 This module contains various configuration settings via
 waffle switches for the Certificates app.
 """
-
-from edx_toggles.toggles import SettingToggle, WaffleSwitch
+from edx_toggles.toggles import WaffleSwitch
 
 # Namespace
 WAFFLE_NAMESPACE = 'certificates'
@@ -15,29 +14,3 @@
 # .. toggle_use_cases: open_edx
 # .. toggle_creation_date: 2017-09-14
 AUTO_CERTIFICATE_GENERATION = WaffleSwitch(f"{WAFFLE_NAMESPACE}.auto_certificate_generation", __name__)
-
-
-# .. toggle_name: SEND_CERTIFICATE_CREATED_SIGNAL
-# .. toggle_implementation: SettingToggle
-# .. toggle_default: False
-# .. toggle_description: When True, the system will publish `CERTIFICATE_CREATED` signals to the event bus. The
-#   `CERTIFICATE_CREATED` signal is emit when a certificate has been awarded to a learner and the creation process has
-#   completed.
-# .. toggle_use_cases: temporary
-# .. toggle_creation_date: 2023-04-11
-# .. toggle_target_removal_date: 2023-07-31
-# .. toggle_tickets: TODO
-SEND_CERTIFICATE_CREATED_SIGNAL = SettingToggle('SEND_CERTIFICATE_CREATED_SIGNAL', default=False, module_name=__name__)
-
-
-# .. toggle_name: SEND_CERTIFICATE_REVOKED_SIGNAL
-# .. toggle_implementation: SettingToggle
-# .. toggle_default: False
-# .. toggle_description: When True, the system will publish `CERTIFICATE_REVOKED` signals to the event bus. The
-#   `CERTIFICATE_REVOKED` signal is emit when a certificate has been revoked from a learner and the revocation process
-#   has completed.
-# .. toggle_use_cases: temporary
-# .. toggle_creation_date: 2023-09-15
-# .. toggle_target_removal_date: 2024-01-01
-# .. toggle_tickets: TODO
-SEND_CERTIFICATE_REVOKED_SIGNAL = SettingToggle('SEND_CERTIFICATE_REVOKED_SIGNAL', default=False, module_name=__name__)
diff --git a/lms/djangoapps/certificates/models.py b/lms/djangoapps/certificates/models.py
index 7b5677a6909c..fa16112f3add 100644
--- a/lms/djangoapps/certificates/models.py
+++ b/lms/djangoapps/certificates/models.py
@@ -26,8 +26,6 @@
 from common.djangoapps.student import models_api as student_api
 from common.djangoapps.student.models import CourseEnrollment
 from common.djangoapps.util.milestones_helpers import fulfill_course_milestone, is_prerequisite_courses_enabled
-from lms.djangoapps.badges.events.course_complete import course_badge_check
-from lms.djangoapps.badges.events.course_meta import completion_check, course_group_check
 from lms.djangoapps.certificates.data import CertificateStatuses
 from lms.djangoapps.instructor_task.models import InstructorTask
 from openedx.core.djangoapps.signals.signals import COURSE_CERT_AWARDED, COURSE_CERT_CHANGED, COURSE_CERT_REVOKED
@@ -1245,31 +1243,6 @@ class Meta:
         app_label = "certificates"
 
 
-@receiver(COURSE_CERT_AWARDED, sender=GeneratedCertificate)
-# pylint: disable=unused-argument
-def create_course_badge(sender, user, course_key, status, **kwargs):
-    """
-    Standard signal hook to create course badges when a certificate has been generated.
-    """
-    course_badge_check(user, course_key)
-
-
-@receiver(COURSE_CERT_AWARDED, sender=GeneratedCertificate)
-def create_completion_badge(sender, user, course_key, status, **kwargs):  # pylint: disable=unused-argument
-    """
-    Standard signal hook to create 'x courses completed' badges when a certificate has been generated.
-    """
-    completion_check(user)
-
-
-@receiver(COURSE_CERT_AWARDED, sender=GeneratedCertificate)
-def create_course_group_badge(sender, user, course_key, status, **kwargs):  # pylint: disable=unused-argument
-    """
-    Standard signal hook to create badges when a user has completed a prespecified set of courses.
-    """
-    course_group_check(user, course_key)
-
-
 class CertificateGenerationCommandConfiguration(ConfigurationModel):
     """
     Manages configuration for a run of the cert_generation management command.
diff --git a/lms/djangoapps/certificates/signals.py b/lms/djangoapps/certificates/signals.py
index 4d43f0ed4983..28e68e340253 100644
--- a/lms/djangoapps/certificates/signals.py
+++ b/lms/djangoapps/certificates/signals.py
@@ -6,12 +6,10 @@
 
 from django.db.models.signals import post_save
 from django.dispatch import receiver
-from openedx_events.event_bus import get_producer
 
 from common.djangoapps.course_modes import api as modes_api
 from common.djangoapps.student.models import CourseEnrollment
 from common.djangoapps.student.signals import ENROLLMENT_TRACK_UPDATED
-from lms.djangoapps.certificates.config import SEND_CERTIFICATE_CREATED_SIGNAL, SEND_CERTIFICATE_REVOKED_SIGNAL
 from lms.djangoapps.certificates.generation_handler import (
     CertificateGenerationNotAllowed,
     generate_allowlist_certificate_task,
@@ -32,7 +30,6 @@
     COURSE_GRADE_NOW_PASSED,
     LEARNER_NOW_VERIFIED
 )
-from openedx_events.learning.signals import CERTIFICATE_CREATED, CERTIFICATE_REVOKED
 
 log = logging.getLogger(__name__)
 
@@ -159,33 +156,3 @@ def _listen_for_enrollment_mode_change(sender, user, course_key, mode, **kwargs)
                 course_key,
             )
             return False
-
-
-@receiver(CERTIFICATE_CREATED)
-def listen_for_certificate_created_event(sender, signal, **kwargs):  # pylint: disable=unused-argument
-    """
-    Publish `CERTIFICATE_CREATED` events to the event bus.
-    """
-    if SEND_CERTIFICATE_CREATED_SIGNAL.is_enabled():
-        get_producer().send(
-            signal=CERTIFICATE_CREATED,
-            topic='learning-certificate-lifecycle',
-            event_key_field='certificate.course.course_key',
-            event_data={'certificate': kwargs['certificate']},
-            event_metadata=kwargs['metadata']
-        )
-
-
-@receiver(CERTIFICATE_REVOKED)
-def listen_for_certificate_revoked_event(sender, signal, **kwargs):  # pylint: disable=unused-argument
-    """
-    Publish `CERTIFICATE_REVOKED` events to the event bus.
-    """
-    if SEND_CERTIFICATE_REVOKED_SIGNAL.is_enabled():
-        get_producer().send(
-            signal=CERTIFICATE_REVOKED,
-            topic='learning-certificate-lifecycle',
-            event_key_field='certificate.course.course_key',
-            event_data={'certificate': kwargs['certificate']},
-            event_metadata=kwargs['metadata']
-        )
diff --git a/lms/djangoapps/certificates/tests/test_signals.py b/lms/djangoapps/certificates/tests/test_signals.py
index 4eb8cf27f48e..320eec4d61d0 100644
--- a/lms/djangoapps/certificates/tests/test_signals.py
+++ b/lms/djangoapps/certificates/tests/test_signals.py
@@ -3,12 +3,9 @@
 and disabling for instructor-paced courses.
 """
 
-from datetime import datetime, timezone
 from unittest import mock
-from uuid import uuid4
 
 import ddt
-from django.test.utils import override_settings
 from edx_toggles.toggles.testutils import override_waffle_flag, override_waffle_switch
 from xmodule.modulestore.tests.django_utils import ModuleStoreTestCase
 from xmodule.modulestore.tests.factories import CourseFactory
@@ -21,17 +18,10 @@
     CertificateGenerationConfiguration,
     GeneratedCertificate
 )
-from lms.djangoapps.certificates.signals import (
-    listen_for_certificate_created_event,
-    listen_for_certificate_revoked_event
-)
 from lms.djangoapps.certificates.tests.factories import CertificateAllowlistFactory, GeneratedCertificateFactory
 from lms.djangoapps.grades.course_grade_factory import CourseGradeFactory
 from lms.djangoapps.grades.tests.utils import mock_passing_grade
 from lms.djangoapps.verify_student.models import SoftwareSecurePhotoVerification
-from openedx_events.data import EventsMetadata
-from openedx_events.learning.signals import CERTIFICATE_CREATED, CERTIFICATE_REVOKED
-from openedx_events.learning.data import CourseData, UserData, UserPersonalData, CertificateData
 
 
 class SelfGeneratedCertsSignalTest(ModuleStoreTestCase):
@@ -443,109 +433,3 @@ def test_verified_to_audit(self):
         ) as mock_allowlist_task:
             self.verified_enrollment.change_mode('audit')
             mock_allowlist_task.assert_not_called()
-
-
-class CertificateEventBusTests(ModuleStoreTestCase):
-    """
-    Tests for Certificate events that interact with the event bus.
-    """
-    def setUp(self):
-        super().setUp()
-        self.user = UserFactory.create()
-        self.name = f'{self.user.first_name} {self.user.last_name}'
-        self.course = CourseFactory.create(self_paced=True)
-        self.enrollment = CourseEnrollmentFactory(
-            user=self.user,
-            course_id=self.course.id,
-            is_active=True,
-            mode='verified',
-        )
-
-    def _create_event_data(self, event_type, certificate_status):
-        """
-        Utility function to create test data for unit tests.
-        """
-        expected_course_data = CourseData(course_key=self.course.id)
-        expected_user_data = UserData(
-            pii=UserPersonalData(
-                username=self.user.username,
-                email=self.user.email,
-                name=self.name,
-            ),
-            id=self.user.id,
-            is_active=self.user.is_active
-        )
-        expected_certificate_data = CertificateData(
-            user=expected_user_data,
-            course=expected_course_data,
-            mode='verified',
-            grade='',
-            current_status=certificate_status,
-            download_url='',
-            name='',
-        )
-        expected_event_metadata = EventsMetadata(
-            event_type=event_type.event_type,
-            id=uuid4(),
-            minorversion=0,
-            source='openedx/lms/web',
-            sourcehost='lms.test',
-            time=datetime.now(timezone.utc)
-        )
-
-        return {
-            'certificate': expected_certificate_data,
-            'metadata': expected_event_metadata,
-        }
-
-    @override_settings(SEND_CERTIFICATE_CREATED_SIGNAL=False)
-    @mock.patch('lms.djangoapps.certificates.signals.get_producer', autospec=True)
-    def test_certificate_created_event_disabled(self, mock_producer):
-        """
-        Test to verify that we do not publish `CERTIFICATE_CREATED` events to the event bus if the
-        `SEND_CERTIFICATE_CREATED_SIGNAL` setting is disabled.
-        """
-        listen_for_certificate_created_event(None, CERTIFICATE_CREATED)
-        mock_producer.assert_not_called()
-
-    @override_settings(SEND_CERTIFICATE_REVOKED_SIGNAL=False)
-    @mock.patch('lms.djangoapps.certificates.signals.get_producer', autospec=True)
-    def test_certificate_revoked_event_disabled(self, mock_producer):
-        """
-        Test to verify that we do not publish `CERTIFICATE_REVOKED` events to the event bus if the
-        `SEND_CERTIFICATE_REVOKED_SIGNAL` setting is disabled.
-        """
-        listen_for_certificate_created_event(None, CERTIFICATE_REVOKED)
-        mock_producer.assert_not_called()
-
-    @override_settings(SEND_CERTIFICATE_CREATED_SIGNAL=True)
-    @mock.patch('lms.djangoapps.certificates.signals.get_producer', autospec=True)
-    def test_certificate_created_event_enabled(self, mock_producer):
-        """
-        Test to verify that we push `CERTIFICATE_CREATED` events to the event bus if the
-        `SEND_CERTIFICATE_CREATED_SIGNAL` setting is enabled.
-        """
-        event_data = self._create_event_data(CERTIFICATE_CREATED, CertificateStatuses.downloadable)
-        listen_for_certificate_created_event(None, CERTIFICATE_CREATED, **event_data)
-        # verify that the data sent to the event bus matches what we expect
-        data = mock_producer.return_value.send.call_args.kwargs
-        assert data['signal'].event_type == CERTIFICATE_CREATED.event_type
-        assert data['event_data']['certificate'] == event_data['certificate']
-        assert data['topic'] == 'learning-certificate-lifecycle'
-        assert data['event_key_field'] == 'certificate.course.course_key'
-
-    @override_settings(SEND_CERTIFICATE_REVOKED_SIGNAL=True)
-    @mock.patch('lms.djangoapps.certificates.signals.get_producer', autospec=True)
-    def test_certificate_revoked_event_enabled(self, mock_producer):
-        """
-        Test to verify that we push `CERTIFICATE_REVOKED` events to the event bus if the
-        `SEND_CERTIFICATE_REVOKED_SIGNAL` setting is enabled.
-        """
-        event_data = self._create_event_data(CERTIFICATE_REVOKED, CertificateStatuses.notpassing)
-        listen_for_certificate_revoked_event(None, CERTIFICATE_REVOKED, **event_data)
-        # verify that the data sent to the event bus matches what we expect
-        data = mock_producer.return_value.send.call_args.kwargs
-        assert data['signal'].event_type == CERTIFICATE_REVOKED.event_type
-        assert data['event_data']['certificate'] == event_data['certificate']
-        assert data['topic'] == 'learning-certificate-lifecycle'
-        assert data['event_key_field'] == 'certificate.course.course_key'
diff --git a/lms/djangoapps/certificates/tests/test_webview_views.py b/lms/djangoapps/certificates/tests/test_webview_views.py
index 1fee63950289..7949b84f13b1 100644
--- a/lms/djangoapps/certificates/tests/test_webview_views.py
+++ b/lms/djangoapps/certificates/tests/test_webview_views.py
@@ -20,12 +20,6 @@
 from common.djangoapps.student.tests.factories import CourseEnrollmentFactory, UserFactory
 from common.djangoapps.track.tests import EventTrackingTestCase
 from common.djangoapps.util.date_utils import strftime_localized
-from lms.djangoapps.badges.events.course_complete import get_completion_badge
-from lms.djangoapps.badges.tests.factories import (
-    BadgeAssertionFactory,
-    BadgeClassFactory,
-    CourseCompleteImageConfigurationFactory
-)
 from lms.djangoapps.certificates.config import AUTO_CERTIFICATE_GENERATION
 from lms.djangoapps.certificates.models import (
     CertificateGenerationCourseSetting,
@@ -58,8 +52,6 @@
 
 FEATURES_WITH_CERTS_ENABLED = settings.FEATURES.copy()
 FEATURES_WITH_CERTS_ENABLED['CERTIFICATES_HTML_VIEW'] = True
-FEATURES_WITH_BADGES_ENABLED = FEATURES_WITH_CERTS_ENABLED.copy()
-FEATURES_WITH_BADGES_ENABLED['ENABLE_OPENBADGES'] = True
 
 FEATURES_WITH_CERTS_DISABLED = settings.FEATURES.copy()
 FEATURES_WITH_CERTS_DISABLED['CERTIFICATES_HTML_VIEW'] = False
@@ -118,7 +110,6 @@ def setUp(self):
         )
         CertificateHtmlViewConfigurationFactory.create()
         LinkedInAddToProfileConfigurationFactory.create()
-        CourseCompleteImageConfigurationFactory.create()
 
     def _add_course_certificates(self, count=1, signatory_count=0, is_active=True):
         """
@@ -533,32 +524,7 @@ def test_rendering_course_organization_data(self):
         self.assertContains(response, f'<title>test_organization {self.course.number} Certificate |')
         self.assertContains(response, 'logo_test1.png')
 
-    @ddt.data(True, False)
-    @patch('lms.djangoapps.certificates.views.webview.get_completion_badge')
-    def test_fetch_badge_info(self, issue_badges, mock_get_completion_badge):
-        """
-        Test: Fetch badge class info if badges are enabled.
-        """
-        if issue_badges:
-            features = FEATURES_WITH_BADGES_ENABLED
-        else:
-            features = FEATURES_WITH_CERTS_ENABLED
-        with override_settings(FEATURES=features):
-            badge_class = BadgeClassFactory(course_id=self.course_id, mode=self.cert.mode)
-            mock_get_completion_badge.return_value = badge_class
-
-            self._add_course_certificates(count=1, signatory_count=1, is_active=True)
-            test_url = get_certificate_url(user_id=self.user.id, course_id=self.cert.course_id,
-                                           uuid=self.cert.verify_uuid)
-            response = self.client.get(test_url)
-            assert response.status_code == 200
-
-        if issue_badges:
-            mock_get_completion_badge.assert_called()
-        else:
-            mock_get_completion_badge.assert_not_called()
-
-    @override_settings(FEATURES=FEATURES_WITH_BADGES_ENABLED)
+    @override_settings(FEATURES=FEATURES_WITH_CERTS_ENABLED)
     @patch.dict("django.conf.settings.SOCIAL_SHARING_SETTINGS", {
         "CERTIFICATE_TWITTER": True,
         "CERTIFICATE_FACEBOOK": True,
@@ -589,10 +555,6 @@ def test_rendering_maximum_data(self):
         test_org = organizations_api.add_organization(organization_data=test_organization_data)
         organizations_api.add_organization_course(organization_data=test_org, course_key=str(self.course.id))
         self._add_course_certificates(count=1, signatory_count=1, is_active=True)
-        badge_class = get_completion_badge(course_id=self.course_id, user=self.user)
-        BadgeAssertionFactory.create(
-            user=self.user, badge_class=badge_class,
-        )
         self.course.cert_html_view_overrides = {
             "logo_src": "/static/certificates/images/course_override_logo.png"
         }
@@ -629,8 +591,6 @@ def test_rendering_maximum_data(self):
                 partner_long_name=long_org_name,
             ),
         )
-        # Test item from badge info
-        self.assertContains(response, "Add to Mozilla Backpack")
         # Test item from site configuration
         self.assertContains(response, "https://www.test-site.org/about-us")
         # Test course overrides
@@ -1784,53 +1744,3 @@ def test_certificate_evidence_event_emitted(self):
             },
             actual_event['data']
         )
-
-    @override_settings(FEATURES=FEATURES_WITH_CERTS_ENABLED)
-    def test_evidence_event_sent(self):
-        self._add_course_certificates(count=1, signatory_count=2)
-
-        cert_url = get_certificate_url(
-            user_id=self.user.id,
-            course_id=self.course_id,
-            uuid=self.cert.verify_uuid
-        )
-        test_url = f'{cert_url}?evidence_visit=1'
-        self.recreate_tracker()
-        badge_class = get_completion_badge(self.course_id, self.user)
-        assertion = BadgeAssertionFactory.create(
-            user=self.user, badge_class=badge_class,
-            backend='DummyBackend',
-            image_url='https://www.example.com/image.png',
-            assertion_url='https://www.example.com/assertion.json',
-            data={
-                'issuer': 'https://www.example.com/issuer.json',
-            }
-        )
-        response = self.client.get(test_url)
-
-        # There are two events being emitted in this flow.
-        # One for page hit (due to the tracker in the middleware) and
-        # one due to the certificate being visited.
-        # We are interested in the second one.
-        actual_event = self.get_event(1)
-
-        assert response.status_code == 200
-        assert_event_matches(
-            {
-                'name': 'edx.badge.assertion.evidence_visited',
-                'data': {
-                    'course_id': 'course-v1:testorg+run1+refundable_course',
-                    'assertion_id': assertion.id,
-                    'badge_generator': 'DummyBackend',
-                    'badge_name': 'refundable course',
-                    'issuing_component': '',
-                    'badge_slug': 'course-v1testorgrun1refundable_course_honor_927f3ad',
-                    'assertion_json_url': 'https://www.example.com/assertion.json',
-                    'assertion_image_url': 'https://www.example.com/image.png',
-                    'user_id': self.user.id,
-                    'issuer': 'https://www.example.com/issuer.json',
-                    'enrollment_mode': 'honor',
-                },
-            },
-            actual_event
-        )
diff --git a/lms/djangoapps/certificates/tests/tests.py b/lms/djangoapps/certificates/tests/tests.py
index ee3bd5c2b19c..a6b6362792b8 100644
--- a/lms/djangoapps/certificates/tests/tests.py
+++ b/lms/djangoapps/certificates/tests/tests.py
@@ -12,9 +12,8 @@
 from pytz import UTC
 
 from common.djangoapps.student.models import CourseEnrollment
-from common.djangoapps.student.tests.factories import CourseEnrollmentFactory, UserFactory
+from common.djangoapps.student.tests.factories import UserFactory
 from common.djangoapps.util.milestones_helpers import milestones_achieved_by_user, set_prerequisite_courses
-from lms.djangoapps.badges.tests.factories import CourseCompleteImageConfigurationFactory
 from lms.djangoapps.certificates.api import certificate_info_for_user, certificate_status_for_student
 from lms.djangoapps.certificates.models import (
     CertificateStatuses,
@@ -204,20 +203,3 @@ def test_course_milestone_collected(self):
         completed_milestones = milestones_achieved_by_user(student, str(pre_requisite_course.id))
         assert len(completed_milestones) == 1
         assert completed_milestones[0]['namespace'] == str(pre_requisite_course.id)
-
-    @patch.dict(settings.FEATURES, {'ENABLE_OPENBADGES': True})
-    @patch('lms.djangoapps.badges.backends.badgr.BadgrBackend', spec=True)
-    def test_badge_callback(self, handler):
-        student = UserFactory()
-        course = CourseFactory.create(org='edx', number='998', display_name='Test Course', issue_badges=True)
-        CourseCompleteImageConfigurationFactory()
-        CourseEnrollmentFactory(user=student, course_id=course.location.course_key, mode='honor')
-        cert = GeneratedCertificateFactory.create(
-            user=student,
-            course_id=course.id,
-            status=CertificateStatuses.generating,
-            mode='verified'
-        )
-        cert.status = CertificateStatuses.downloadable
-        cert.save()
-        assert handler.return_value.award.called
diff --git a/lms/djangoapps/certificates/views/webview.py b/lms/djangoapps/certificates/views/webview.py
index 4d99b7d7722d..28c7423948e0 100644
--- a/lms/djangoapps/certificates/views/webview.py
+++ b/lms/djangoapps/certificates/views/webview.py
@@ -15,7 +15,6 @@
 from django.template import RequestContext
 from django.utils import translation
 from django.utils.encoding import smart_str
-from eventtracking import tracker
 from opaque_keys import InvalidKeyError
 from opaque_keys.edx.keys import CourseKey
 from openedx_filters.learning.filters import CertificateRenderStarted
@@ -27,8 +26,6 @@
 from common.djangoapps.student.models import LinkedInAddToProfileConfiguration
 from common.djangoapps.util.date_utils import strftime_localized
 from common.djangoapps.util.views import handle_500
-from lms.djangoapps.badges.events.course_complete import get_completion_badge
-from lms.djangoapps.badges.utils import badges_enabled
 from lms.djangoapps.certificates.api import (
     certificates_viewable_for_course,
     display_date_for_certificate,
@@ -396,42 +393,6 @@ def _track_certificate_events(request, course, user, user_certificate):
     """
     Tracks web certificate view related events.
     """
-    # Badge Request Event Tracking Logic
-    course_key = course.location.course_key
-
-    if 'evidence_visit' in request.GET:
-        badge_class = get_completion_badge(course_key, user)
-        if not badge_class:
-            log.warning('Visit to evidence URL for badge, but badges not configured for course "%s"', course_key)
-            badges = []
-        else:
-            badges = badge_class.get_for_user(user)
-        if badges:
-            # There should only ever be one of these.
-            badge = badges[0]
-            tracker.emit(
-                'edx.badge.assertion.evidence_visited',
-                {
-                    'badge_name': badge.badge_class.display_name,
-                    'badge_slug': badge.badge_class.slug,
-                    'badge_generator': badge.backend,
-                    'issuing_component': badge.badge_class.issuing_component,
-                    'user_id': user.id,
-                    'course_id': str(course_key),
-                    'enrollment_mode': badge.badge_class.mode,
-                    'assertion_id': badge.id,
-                    'assertion_image_url': badge.image_url,
-                    'assertion_json_url': badge.assertion_url,
-                    'issuer': badge.data.get('issuer'),
-                }
-            )
-        else:
-            log.warning(
-                "Could not find badge for %s on course %s.",
-                user.id,
-                course_key,
-            )
-
     # track certificate evidence_visited event for analytics when certificate_user and accessing_user are different
     if request.user and request.user.id != user.id:
         emit_certificate_event('evidence_visited', user, str(course.id), event_data={
@@ -441,18 +402,6 @@ def _track_certificate_events(request, course, user, user_certificate):
         })
 
 
-def _update_badge_context(context, course, user):
-    """
-    Updates context with badge info.
-    """
-    badge = None
-    if badges_enabled() and course.issue_badges:
-        badges = get_completion_badge(course.location.course_key, user).get_for_user(user)
-        if badges:
-            badge = badges[0]
-    context['badge'] = badge
-
-
 def _update_organization_context(context, course):
     """
     Updates context with organization related info.
@@ -630,9 +579,6 @@ def render_html_view(request, course_id, certificate=None):  # pylint: disable=t
         # Append/Override the existing view context values with certificate specific values
         _update_certificate_context(context, course, course_overview, user_certificate, platform_name)
 
-        # Append badge info
-        _update_badge_context(context, course, user)
-
         # Add certificate header/footer data to current context
         context.update(get_certificate_header_context(is_secure=request.is_secure()))
         context.update(get_certificate_footer_context())
diff --git a/lms/djangoapps/commerce/api/v0/tests/test_views.py b/lms/djangoapps/commerce/api/v0/tests/test_views.py
index d773598f0a4f..ef9327fe6f43 100644
--- a/lms/djangoapps/commerce/api/v0/tests/test_views.py
+++ b/lms/djangoapps/commerce/api/v0/tests/test_views.py
@@ -307,4 +307,4 @@ def test_login_required(self):
         """ The view should return 403 if the user is not logged in. """
         self.client.logout()
         response = self.client.get(self.path)
-        assert response.status_code == 403
+        assert response.status_code == 401
diff --git a/lms/djangoapps/commerce/api/v0/views.py b/lms/djangoapps/commerce/api/v0/views.py
index b0fa4fcc6e5c..102217350354 100644
--- a/lms/djangoapps/commerce/api/v0/views.py
+++ b/lms/djangoapps/commerce/api/v0/views.py
@@ -9,7 +9,6 @@
 from opaque_keys import InvalidKeyError
 from opaque_keys.edx.keys import CourseKey
 from requests.exceptions import HTTPError
-from rest_framework.authentication import SessionAuthentication
 from rest_framework.permissions import IsAuthenticated
 from rest_framework.status import HTTP_406_NOT_ACCEPTABLE, HTTP_409_CONFLICT
 from rest_framework.views import APIView
@@ -164,7 +163,6 @@ class BasketOrderView(APIView):
     Retrieve the order associated with a basket.
     """
 
-    authentication_classes = (SessionAuthentication,)
     permission_classes = (IsAuthenticated,)
 
     def get(self, request, *_args, **kwargs):
diff --git a/lms/djangoapps/commerce/api/v1/tests/test_views.py b/lms/djangoapps/commerce/api/v1/tests/test_views.py
index 47de5d8ff598..0d9557c31a54 100644
--- a/lms/djangoapps/commerce/api/v1/tests/test_views.py
+++ b/lms/djangoapps/commerce/api/v1/tests/test_views.py
@@ -23,7 +23,7 @@
 from ....tests.mocks import mock_order_endpoint
 from ....tests.test_views import UserMixin
 
-PASSWORD = 'test'
+PASSWORD = 'Password1234'
 JSON_CONTENT_TYPE = 'application/json'
 
 
diff --git a/lms/djangoapps/commerce/tests/test_views.py b/lms/djangoapps/commerce/tests/test_views.py
index 9af2ee7d9701..410d2520cc35 100644
--- a/lms/djangoapps/commerce/tests/test_views.py
+++ b/lms/djangoapps/commerce/tests/test_views.py
@@ -3,6 +3,9 @@
 from common.djangoapps.student.tests.factories import UserFactory
 
 
+TEST_PASSWORD = "Password1234"
+
+
 class UserMixin:
     """ Mixin for tests involving users. """
 
@@ -12,4 +15,4 @@ def setUp(self):
 
     def _login(self):
         """ Log into LMS. """
-        self.client.login(username=self.user.username, password='test')
+        self.client.login(username=self.user.username, password=TEST_PASSWORD)
diff --git a/lms/djangoapps/course_api/api.py b/lms/djangoapps/course_api/api.py
index 01b5e5bfee0d..8210396441c7 100644
--- a/lms/djangoapps/course_api/api.py
+++ b/lms/djangoapps/course_api/api.py
@@ -82,7 +82,7 @@ def course_detail(request, username, course_key):
     return overview
 
 
-def _filter_by_search(course_queryset, search_term):
+def _filter_by_search(course_queryset, search_term, mobile_search=False):
     """
     Filters a course queryset by the specified search term.
     """
@@ -101,6 +101,13 @@ def _filter_by_search(course_queryset, search_term):
 
     search_courses_ids = {course['data']['id'] for course in search_courses['results']}
 
+    if mobile_search is True:
+        course_limit = getattr(settings, 'MOBILE_SEARCH_COURSE_LIMIT', 100)
+        courses = [course for course in course_queryset[:course_limit] if str(course.id) in search_courses_ids]
+        return LazySequence(
+            iter(courses),
+            est_len=len(courses)
+        )
     return LazySequence(
         (
             course for course in course_queryset
@@ -117,7 +124,8 @@ def list_courses(request,
                  search_term=None,
                  permissions=None,
                  active_only=False,
-                 course_keys=None):
+                 course_keys=None,
+                 mobile_search=False):
     """
     Yield all available courses.
 
@@ -150,6 +158,9 @@ def list_courses(request,
         course_keys (list[str]):
             If specified, it filters visible `CourseOverview` objects by
             the course keys (ids) provided
+        mobile_search (bool):
+            Optional parameter that limits the number of returned courses
+            to MOBILE_SEARCH_COURSE_LIMIT.
 
     Return value:
         Yield `CourseOverview` objects representing the collection of courses.
@@ -158,7 +169,7 @@ def list_courses(request,
     course_qs = get_courses(
         user, org=org, filter_=filter_, permissions=permissions, active_only=active_only, course_keys=course_keys
     )
-    course_qs = _filter_by_search(course_qs, search_term)
+    course_qs = _filter_by_search(course_qs, search_term, mobile_search)
     return course_qs
 
 
diff --git a/lms/djangoapps/course_api/blocks/tests/test_views.py b/lms/djangoapps/course_api/blocks/tests/test_views.py
index 72e5e430f6d8..e2426708d6bc 100644
--- a/lms/djangoapps/course_api/blocks/tests/test_views.py
+++ b/lms/djangoapps/course_api/blocks/tests/test_views.py
@@ -60,7 +60,7 @@ def setUp(self):
         self.admin_user = AdminFactory.create()
         self.data_researcher = UserFactory.create()
         CourseDataResearcherRole(self.course_key).add_users(self.data_researcher)
-        self.client.login(username=self.user.username, password='test')
+        self.client.login(username=self.user.username, password=self.TEST_PASSWORD)
         CourseEnrollmentFactory.create(user=self.user, course_id=self.course_key)
 
         # default values for url and query_params
@@ -248,7 +248,7 @@ def test_public_course_all_blocks_and_empty_username(self):
         self.client.logout()
         self.verify_response(403, cacheable=False)
         # Verify response for a staff user.
-        self.client.login(username=self.admin_user.username, password='test')
+        self.client.login(username=self.admin_user.username, password=self.TEST_PASSWORD)
         self.verify_response(cacheable=False)
 
     def test_non_existent_course(self):
@@ -269,7 +269,7 @@ def test_no_user_staff_not_all_blocks(self):
         self.verify_response(400)
 
     def test_no_user_staff_all_blocks(self):
-        self.client.login(username=self.admin_user.username, password='test')
+        self.client.login(username=self.admin_user.username, password=self.TEST_PASSWORD)
         self.query_params.pop('username')
         self.query_params['all_blocks'] = True
         self.verify_response()
@@ -319,7 +319,7 @@ def test_extra_field_when_requested(self):
             - other_course_settings
             - course_visibility
         """
-        self.client.login(username=self.admin_user.username, password='test')
+        self.client.login(username=self.admin_user.username, password=self.TEST_PASSWORD)
         response = self.verify_response(params={
             'all_blocks': True,
             'requested_fields': ['other_course_settings', 'course_visibility'],
@@ -351,7 +351,7 @@ def test_extra_field_when_not_requested(self):
             - other_course_settings
             - course_visibility
         """
-        self.client.login(username=self.admin_user.username, password='test')
+        self.client.login(username=self.admin_user.username, password=self.TEST_PASSWORD)
         response = self.verify_response(params={
             'all_blocks': True,
             'requested_fields': ['course_visibility'],
@@ -370,7 +370,7 @@ def test_data_researcher_access(self):
         """
         Test if data researcher has access to the api endpoint
         """
-        self.client.login(username=self.data_researcher.username, password='test')
+        self.client.login(username=self.data_researcher.username, password=self.TEST_PASSWORD)
 
         self.verify_response(params={
             'all_blocks': True,
@@ -556,7 +556,7 @@ def setUpClass(cls):
     def setUp(self):
         super().setUp()
         self.admin_user = AdminFactory.create()
-        self.client.login(username=self.admin_user.username, password='test')
+        self.client.login(username=self.admin_user.username, password=self.TEST_PASSWORD)
         self.usage_key = list(self.non_orphaned_block_usage_keys)[0]
         self.url = reverse(
             'blocks_metadata',
diff --git a/lms/djangoapps/course_api/forms.py b/lms/djangoapps/course_api/forms.py
index ff6cee84aea6..79dba03f45e8 100644
--- a/lms/djangoapps/course_api/forms.py
+++ b/lms/djangoapps/course_api/forms.py
@@ -65,6 +65,7 @@ class CourseListGetForm(UsernameValidatorMixin, Form):
     active_only = ExtendedNullBooleanField(required=False)
     permissions = MultiValueField(required=False)
     course_keys = MultiValueField(required=False)
+    mobile_search = ExtendedNullBooleanField(required=False)
 
     def clean(self):
         """
diff --git a/lms/djangoapps/course_api/tests/mixins.py b/lms/djangoapps/course_api/tests/mixins.py
index 2940826c68c4..46671867b72c 100644
--- a/lms/djangoapps/course_api/tests/mixins.py
+++ b/lms/djangoapps/course_api/tests/mixins.py
@@ -8,7 +8,7 @@
 from common.djangoapps.student.tests.factories import UserFactory, CourseEnrollmentFactory, CourseAccessRoleFactory
 from xmodule.modulestore.tests.factories import ToyCourseFactory  # lint-amnesty, pylint: disable=wrong-import-order
 
-TEST_PASSWORD = 'edx'
+TEST_PASSWORD = 'Password1234'
 
 
 class CourseApiFactoryMixin:
diff --git a/lms/djangoapps/course_api/tests/test_forms.py b/lms/djangoapps/course_api/tests/test_forms.py
index 3b5744402e79..43a4aa104bde 100644
--- a/lms/djangoapps/course_api/tests/test_forms.py
+++ b/lms/djangoapps/course_api/tests/test_forms.py
@@ -72,6 +72,7 @@ def set_up_data(self, user):
             'permissions': set(),
             'active_only': None,
             'course_keys': set(),
+            'mobile_search': None,
         }
 
     def test_basic(self):
diff --git a/lms/djangoapps/course_api/tests/test_views.py b/lms/djangoapps/course_api/tests/test_views.py
index 57b64d264cae..c39f808478ef 100644
--- a/lms/djangoapps/course_api/tests/test_views.py
+++ b/lms/djangoapps/course_api/tests/test_views.py
@@ -449,6 +449,46 @@ def test_too_many_courses(self):
                 assert len(response.data['results']) == (30 if (page < 11) else 3)
                 assert [c['id'] for c in response.data['results']] == ordered_course_ids[((page - 1) * 30):(page * 30)]
 
+    def test_count_item_pagination_with_search_term(self):
+        """
+        Test count items in pagination for api courses list - class CourseListView
+        """
+        # Create 15 new courses, courses have the word "new" in the title
+        [self.create_and_index_course(f"numb_{number}", f"new_{number}") for number in range(15)]  # pylint: disable=expression-not-assigned
+        response = self.verify_response(params={"search_term": "new"})
+        self.assertEqual(response.status_code, 200)
+        # We don't have 'count' 15 because 'mobile_search' param is None
+        # And LazySequence contains all courses
+        self.assertEqual(response.json()["pagination"]["count"], 18)
+
+    def test_count_item_pagination_with_search_term_and_filter(self):
+        """
+        Test count items in pagination for api courses list
+        with search_term and filter by organisation -
+        class CourseListView
+        """
+        # Create 25 new courses with two different organisations
+        [self.create_and_index_course("Org_N", f"new_{number}") for number in range(10)]  # pylint: disable=expression-not-assigned
+        [self.create_and_index_course("Org_X", f"new_{number}") for number in range(15)]  # pylint: disable=expression-not-assigned
+        response = self.verify_response(params={"org": "Org_X", "search_term": "new"})
+        self.assertEqual(response.status_code, 200)
+        self.assertEqual(response.json()["pagination"]["count"], 15)
+
+    def test_count_item_pagination_with_search_term_and_mobile_search(self):
+        """
+        Test count items in pagination for api courses list
+        with search_term and 'mobile_search' is True
+        """
+        # Create 25 new courses with two different words in titles
+        [self.create_and_index_course("Org_N", f"old_{number}") for number in range(10)]  # pylint: disable=expression-not-assigned
+        [self.create_and_index_course("Org_N", f"new_{number}") for number in range(15)]  # pylint: disable=expression-not-assigned
+        response = self.verify_response(
+            params={"search_term": "new", "mobile_search": True}
+        )
+        self.assertEqual(response.status_code, 200)
+        # We have 'count' 15 because 'mobile_search' param is true
+        self.assertEqual(response.json()["pagination"]["count"], 15)
+
 
 class CourseIdListViewTestCase(CourseApiTestViewMixin, ModuleStoreTestCase):
     """
diff --git a/lms/djangoapps/course_api/views.py b/lms/djangoapps/course_api/views.py
index 98b01232a1be..b2019c793fec 100644
--- a/lms/djangoapps/course_api/views.py
+++ b/lms/djangoapps/course_api/views.py
@@ -290,6 +290,10 @@ class CourseListView(DeveloperErrorViewMixin, ListAPIView):
             If specified, it fetches the `CourseOverview` objects for the
             the specified course keys
 
+        mobile_search (bool):
+            Optional parameter that limits the number of returned courses
+            to MOBILE_SEARCH_COURSE_LIMIT.
+
     **Returns**
 
         * 200 on success, with a list of course discovery objects as returned
@@ -349,6 +353,7 @@ def get_queryset(self):
             permissions=form.cleaned_data['permissions'],
             active_only=form.cleaned_data.get('active_only', False),
             course_keys=form.cleaned_data['course_keys'],
+            mobile_search=form.cleaned_data.get('mobile_search', False),
         )
 
 
diff --git a/lms/djangoapps/course_blocks/transformers/tests/helpers.py b/lms/djangoapps/course_blocks/transformers/tests/helpers.py
index 27e7a686abcd..fb78946280fd 100644
--- a/lms/djangoapps/course_blocks/transformers/tests/helpers.py
+++ b/lms/djangoapps/course_blocks/transformers/tests/helpers.py
@@ -50,7 +50,7 @@ def setUp(self):
         """
         super().setUp()
         # Set up users.
-        self.password = 'test'
+        self.password = self.TEST_PASSWORD
         self.user = UserFactory.create(password=self.password)
         self.staff = UserFactory.create(password=self.password, is_staff=True)
 
@@ -253,7 +253,7 @@ def setUp(self):
                     parent_block.children.append(self.xblock_keys[i])
                     update_block(parent_block)
 
-        self.password = 'test'
+        self.password = self.TEST_PASSWORD
         self.student = UserFactory.create(is_staff=False, username='test_student', password=self.password)
         self.staff = UserFactory.create(is_staff=True, username='test_staff', password=self.password)
         CourseEnrollmentFactory.create(
diff --git a/lms/djangoapps/course_wiki/middleware.py b/lms/djangoapps/course_wiki/middleware.py
index 54884a23f252..37bef0b74740 100644
--- a/lms/djangoapps/course_wiki/middleware.py
+++ b/lms/djangoapps/course_wiki/middleware.py
@@ -15,6 +15,8 @@
 from openedx.features.enterprise_support.api import get_enterprise_consent_url
 from common.djangoapps.student.models import CourseEnrollment
 
+from xmodule.modulestore.django import modulestore
+
 
 class WikiAccessMiddleware(MiddlewareMixin):
     """
@@ -55,6 +57,20 @@ def process_view(self, request, view_func, view_args, view_kwargs):  # lint-amne
         course_id = course_id_from_url(request.path)
         wiki_path = request.path.partition('/wiki/')[2]
 
+        # if no wiki_path, can't get wiki_slug, so no point trying to look up
+        # course_id by wiki_slug
+        if not course_id and wiki_path:
+            # wiki path always starts with wiki_slug
+            wiki_slug = wiki_path.split('/')[0]
+
+            course_ids = modulestore().get_courses_for_wiki(wiki_slug)
+            # the above can return multiple courses, and to avoid ambiguity and
+            # avoid pointing to wrong courses, we only set course_id if we've
+            # got an exact match, i.e. only one course was returned for a
+            # wiki_slug
+            if len(course_ids) == 1:
+                course_id = course_ids[0]
+
         if course_id:
             # This is a /courses/org/name/run/wiki request
             course_path = f"/courses/{str(course_id)}"
diff --git a/lms/djangoapps/course_wiki/tests/test_middleware.py b/lms/djangoapps/course_wiki/tests/test_middleware.py
index d9fa62608cb1..264a24f5a297 100644
--- a/lms/djangoapps/course_wiki/tests/test_middleware.py
+++ b/lms/djangoapps/course_wiki/tests/test_middleware.py
@@ -34,3 +34,10 @@ def test_url_tranform(self):
         response = self.client.get('/courses/course-v1:edx+math101+2014/wiki/math101/')
         self.assertContains(response, '/courses/course-v1:edx+math101+2014/wiki/math101/_edit/')
         self.assertContains(response, '/courses/course-v1:edx+math101+2014/wiki/math101/_settings/')
+
+    def test_finds_course_by_wiki_slug(self):
+        """Test that finds course by wiki slug, if course id is not present in the url."""
+        response = self.client.get('/wiki/math101/')
+        request = response.wsgi_request
+        self.assertTrue(hasattr(request, 'course'))
+        self.assertEqual(request.course.id, self.course_math101.id)
diff --git a/lms/djangoapps/course_wiki/tests/tests.py b/lms/djangoapps/course_wiki/tests/tests.py
index 8cdd93115d6b..7fc86947d4fa 100644
--- a/lms/djangoapps/course_wiki/tests/tests.py
+++ b/lms/djangoapps/course_wiki/tests/tests.py
@@ -24,7 +24,7 @@ def setUp(self):
         # Create two accounts
         self.student = 'view@test.com'
         self.instructor = 'view2@test.com'
-        self.password = 'foo'
+        self.password = self.TEST_PASSWORD
         for username, email in [('u1', self.student), ('u2', self.instructor)]:
             self.create_account(username, email, self.password)
             self.activate_user(email)
diff --git a/lms/djangoapps/courseware/block_render.py b/lms/djangoapps/courseware/block_render.py
index 650b4418b423..fc02e2662e67 100644
--- a/lms/djangoapps/courseware/block_render.py
+++ b/lms/djangoapps/courseware/block_render.py
@@ -40,8 +40,6 @@
 from xblock.reference.plugins import FSService
 from xblock.runtime import KvsFieldData
 
-from lms.djangoapps.badges.service import BadgingService
-from lms.djangoapps.badges.utils import badges_enabled
 from lms.djangoapps.teams.services import TeamsService
 from openedx.core.lib.xblock_services.call_to_action import CallToActionService
 from xmodule.contentstore.django import contentstore
@@ -630,7 +628,6 @@ def inner_get_block(block: XBlock) -> XBlock | None:
         'partitions': PartitionService(course_id=course_id, cache=DEFAULT_REQUEST_CACHE.data),
         'settings': SettingsService(),
         'user_tags': UserTagsService(user=user, course_id=course_id),
-        'badging': BadgingService(course_id=course_id, modulestore=store) if badges_enabled() else None,
         'teams': TeamsService(),
         'teams_configuration': TeamsConfigurationService(),
         'call_to_action': CallToActionService(),
diff --git a/lms/djangoapps/courseware/plugins.py b/lms/djangoapps/courseware/plugins.py
index 843cf4e77765..10fa99957d71 100644
--- a/lms/djangoapps/courseware/plugins.py
+++ b/lms/djangoapps/courseware/plugins.py
@@ -9,10 +9,8 @@
 
 from xmodule.modulestore.django import modulestore
 
-from cms.djangoapps.contentstore.utils import get_proctored_exam_settings_url
 from openedx.core.djangoapps.content.course_overviews.models import CourseOverview
 from openedx.core.djangoapps.course_apps.plugins import CourseApp
-from openedx.core.djangoapps.course_apps.toggles import proctoring_settings_modal_view_enabled
 from openedx.core.lib.courses import get_course_by_id
 
 User = get_user_model()
@@ -211,11 +209,6 @@ def get_allowed_operations(cls, course_key: CourseKey, user: Optional[User] = No
             "configure": True,
         }
 
-    @staticmethod
-    def legacy_link(course_key: CourseKey):
-        if not proctoring_settings_modal_view_enabled(course_key):
-            return get_proctored_exam_settings_url(course_key)
-
 
 class CustomPagesCourseApp(CourseApp):
     """
diff --git a/lms/djangoapps/courseware/rules.py b/lms/djangoapps/courseware/rules.py
index 8202418f6f4c..07cbbab9022c 100644
--- a/lms/djangoapps/courseware/rules.py
+++ b/lms/djangoapps/courseware/rules.py
@@ -18,7 +18,7 @@
 from openedx.core.djangoapps.content.course_overviews.models import CourseOverview
 from openedx.core.djangoapps.enrollments.api import is_enrollment_valid_for_proctoring
 from common.djangoapps.student.models import CourseAccessRole
-from common.djangoapps.student.roles import CourseRole, OrgRole
+from common.djangoapps.student.roles import CourseRole, OrgRole, strict_role_checking
 from xmodule.course_block import CourseBlock  # lint-amnesty, pylint: disable=wrong-import-order
 from xmodule.error_block import ErrorBlock  # lint-amnesty, pylint: disable=wrong-import-order
 
@@ -47,10 +47,14 @@ class HasAccessRule(Rule):
     """
     A rule that calls `has_access` to determine whether it passes
     """
-    def __init__(self, action):
+    def __init__(self, action, strict=False):
         self.action = action
+        self.strict = strict
 
     def check(self, user, instance=None):
+        if self.strict:
+            with strict_role_checking():
+                return has_access(user, self.action, instance)
         return has_access(user, self.action, instance)
 
     def query(self, user):
diff --git a/lms/djangoapps/courseware/tests/helpers.py b/lms/djangoapps/courseware/tests/helpers.py
index 3a2ddbc45630..85241ead4a5b 100644
--- a/lms/djangoapps/courseware/tests/helpers.py
+++ b/lms/djangoapps/courseware/tests/helpers.py
@@ -4,6 +4,7 @@
 
 
 import ast
+import re
 import json
 from collections import OrderedDict
 from datetime import timedelta
@@ -128,7 +129,7 @@ def setup_course(self):  # lint-amnesty, pylint: disable=missing-function-docstr
         self.clients = {user.username: Client() for user in self.users}
         self.login_statuses = [
             self.clients[user.username].login(
-                username=user.username, password='test')
+                username=user.username, password=self.TEST_PASSWORD)
             for user in self.users
         ]
 
@@ -173,7 +174,7 @@ def setup_user(self):
         Create a user account, activate, and log in.
         """
         self.email = 'foo@test.com'  # lint-amnesty, pylint: disable=attribute-defined-outside-init
-        self.password = 'bar'  # lint-amnesty, pylint: disable=attribute-defined-outside-init
+        self.password = 'Password1234'  # lint-amnesty, pylint: disable=attribute-defined-outside-init
         self.username = 'test'  # lint-amnesty, pylint: disable=attribute-defined-outside-init
         self.user = self.create_account(
             self.username,
@@ -450,11 +451,15 @@ def get_context_dict_from_string(data):
     Retrieve dictionary from string.
     """
     # Replace tuple and un-necessary info from inside string and get the dictionary.
-    cleaned_data = ast.literal_eval(data.split('((\'video.html\',')[1].replace("),\n {})", '').strip())
-    cleaned_data['metadata'] = OrderedDict(
-        sorted(json.loads(cleaned_data['metadata']).items(), key=lambda t: t[0])
+    cleaned_data = data.split('((\'video.html\',')[1].replace("),\n {})", '').strip()
+    # Omit user_id validation
+    cleaned_data_without_user = re.sub(".*user_id.*\n?", '', cleaned_data)
+
+    validated_data = ast.literal_eval(cleaned_data_without_user)
+    validated_data['metadata'] = OrderedDict(
+        sorted(json.loads(validated_data['metadata']).items(), key=lambda t: t[0])
     )
-    return cleaned_data
+    return validated_data
 
 
 def set_preview_mode(preview_mode: bool):
diff --git a/lms/djangoapps/courseware/tests/test_about.py b/lms/djangoapps/courseware/tests/test_about.py
index f1f915fd02f4..d53d620d3e34 100644
--- a/lms/djangoapps/courseware/tests/test_about.py
+++ b/lms/djangoapps/courseware/tests/test_about.py
@@ -284,7 +284,7 @@ def test_enrollment_cap(self):
         # pylint: disable=attribute-defined-outside-init
         # create a new account since the first account is already enrolled in the course
         self.email = 'foo_second@test.com'
-        self.password = 'bar'
+        self.password = 'Password1234'
         self.username = 'test_second'
         self.create_account(self.username, self.email, self.password)
         self.activate_user(self.email)
diff --git a/lms/djangoapps/courseware/tests/test_access.py b/lms/djangoapps/courseware/tests/test_access.py
index 8a4cbabad6cc..ba93ec676205 100644
--- a/lms/djangoapps/courseware/tests/test_access.py
+++ b/lms/djangoapps/courseware/tests/test_access.py
@@ -82,8 +82,8 @@ def setUp(self):
         super().setUp()
 
         # Create ccx coach account
-        self.coach = AdminFactory.create(password="test")
-        self.client.login(username=self.coach.username, password="test")
+        self.coach = AdminFactory.create(password=self.TEST_PASSWORD)
+        self.client.login(username=self.coach.username, password=self.TEST_PASSWORD)
 
         # assign role to coach
         role = CourseCcxCoachRole(self.course.id)
@@ -152,7 +152,7 @@ def test_access_student_progress_ccx(self):
         assert resp.status_code == 200
 
         # Assert access of a student
-        self.client.login(username=student.username, password='test')
+        self.client.login(username=student.username, password=self.TEST_PASSWORD)
         resp = self.client.get(reverse('student_progress', args=[str(ccx_locator), self.coach.id]))
         assert resp.status_code == 404
 
diff --git a/lms/djangoapps/courseware/tests/test_block_render.py b/lms/djangoapps/courseware/tests/test_block_render.py
index 80827afa632c..668ce5171213 100644
--- a/lms/djangoapps/courseware/tests/test_block_render.py
+++ b/lms/djangoapps/courseware/tests/test_block_render.py
@@ -75,8 +75,6 @@
     ATTR_KEY_USER_IS_STAFF,
     ATTR_KEY_USER_ROLE,
 )
-from lms.djangoapps.badges.tests.factories import BadgeClassFactory
-from lms.djangoapps.badges.tests.test_models import get_image
 from lms.djangoapps.courseware import block_render as render
 from lms.djangoapps.courseware.access_response import AccessResponse
 from lms.djangoapps.courseware.courses import get_course_info_section, get_course_with_access
@@ -362,7 +360,7 @@ def test_anonymous_post_xblock_callback(self):
 
     def test_session_authentication(self):
         """ Test that the xblock endpoint supports session authentication."""
-        self.client.login(username=self.mock_user.username, password="test")
+        self.client.login(username=self.mock_user.username, password=self.TEST_PASSWORD)
         dispatch_url = self._get_dispatch_url()
         response = self.client.post(dispatch_url)
         assert 200 == response.status_code
@@ -387,7 +385,7 @@ def test_missing_position_handler(self):
         """
         Test that sending POST request without or invalid position argument don't raise server error
         """
-        self.client.login(username=self.mock_user.username, password="test")
+        self.client.login(username=self.mock_user.username, password=self.TEST_PASSWORD)
         dispatch_url = self._get_dispatch_url()
         response = self.client.post(dispatch_url)
         assert 200 == response.status_code
@@ -2377,46 +2375,6 @@ def test_get_set_tag(self):
             self.block.runtime.service(self.block, 'user_tags').get_tag('fake_scope', key)
 
 
-@ddt.ddt
-class TestBadgingService(LMSXBlockServiceMixin):
-    """Test the badging service interface"""
-
-    @patch.dict(settings.FEATURES, {'ENABLE_OPENBADGES': True})
-    def test_service_rendered(self):
-        self._prepare_runtime()
-        assert self.block.runtime.service(self.block, 'badging')
-
-    def test_no_service_rendered(self):
-        with pytest.raises(NoSuchServiceError):
-            self.block.runtime.service(self.block, 'badging')
-
-    @ddt.data(True, False)
-    @patch.dict(settings.FEATURES, {'ENABLE_OPENBADGES': True})
-    def test_course_badges_toggle(self, toggle):
-        self.course = CourseFactory.create(metadata={'issue_badges': toggle})
-        self._prepare_runtime()
-        assert self.block.runtime.service(self.block, 'badging').course_badges_enabled is toggle
-
-    @patch.dict(settings.FEATURES, {'ENABLE_OPENBADGES': True})
-    def test_get_badge_class(self):
-        self._prepare_runtime()
-        badge_service = self.block.runtime.service(self.block, 'badging')
-        premade_badge_class = BadgeClassFactory.create()
-        # Ignore additional parameters. This class already exists.
-        # We should get back the first class we created, rather than a new one.
-        with get_image('good') as image_handle:
-            badge_class = badge_service.get_badge_class(
-                slug='test_slug', issuing_component='test_component', description='Attempted override',
-                criteria='test', display_name='Testola', image_file_handle=image_handle
-            )
-        # These defaults are set on the factory.
-        assert badge_class.criteria == 'https://example.com/syllabus'
-        assert badge_class.display_name == 'Test Badge'
-        assert badge_class.description == "Yay! It's a test badge."
-        # File name won't always be the same.
-        assert badge_class.image.path == premade_badge_class.image.path
-
-
 class TestI18nService(LMSXBlockServiceMixin):
     """ Test XBlockI18nService """
 
diff --git a/lms/djangoapps/courseware/tests/test_course_survey.py b/lms/djangoapps/courseware/tests/test_course_survey.py
index d729add1b6c8..98b5842cd2b5 100644
--- a/lms/djangoapps/courseware/tests/test_course_survey.py
+++ b/lms/djangoapps/courseware/tests/test_course_survey.py
@@ -22,7 +22,7 @@ class SurveyViewsTests(LoginEnrollmentTestCase, SharedModuleStoreTestCase, XssTe
     """
     All tests for the views.py file
     """
-    STUDENT_INFO = [('view@test.com', 'foo')]
+    STUDENT_INFO = [('view@test.com', 'Password1234')]
 
     @classmethod
     def setUpClass(cls):
diff --git a/lms/djangoapps/courseware/tests/test_discussion_xblock.py b/lms/djangoapps/courseware/tests/test_discussion_xblock.py
index bbe0e68bdcd1..599f125a7e38 100644
--- a/lms/djangoapps/courseware/tests/test_discussion_xblock.py
+++ b/lms/djangoapps/courseware/tests/test_discussion_xblock.py
@@ -366,7 +366,7 @@ def test_discussion_student_view_data(self):
         """
         Tests that course block api returns student_view_data for discussion xblock
         """
-        self.client.login(username=self.user.username, password='test')
+        self.client.login(username=self.user.username, password=self.TEST_PASSWORD)
         url = reverse('blocks_in_block_tree', kwargs={'usage_key_string': str(self.course_usage_key)})
         query_params = {
             'depth': 'all',
diff --git a/lms/djangoapps/courseware/tests/test_entrance_exam.py b/lms/djangoapps/courseware/tests/test_entrance_exam.py
index 240a9494fc8f..338a7bedfcf1 100644
--- a/lms/djangoapps/courseware/tests/test_entrance_exam.py
+++ b/lms/djangoapps/courseware/tests/test_entrance_exam.py
@@ -136,7 +136,7 @@ def setUp(self):
         self.request = get_mock_request(UserFactory())
         self.course = self.update_course(self.course, self.request.user.id)
 
-        self.client.login(username=self.request.user.username, password="test")
+        self.client.login(username=self.request.user.username, password=self.TEST_PASSWORD)
         CourseEnrollment.enroll(self.request.user, self.course.id)
 
         self.expected_locked_toc = (
@@ -257,7 +257,7 @@ def test_skip_entrance_exam_gating(self):
 
         # hit skip entrance exam api in instructor app
         instructor = InstructorFactory(course_key=self.course.id)
-        self.client.login(username=instructor.username, password='test')
+        self.client.login(username=instructor.username, password=self.TEST_PASSWORD)
         url = reverse('mark_student_can_skip_entrance_exam', kwargs={'course_id': str(self.course.id)})
         response = self.client.post(url, {
             'unique_student_identifier': self.request.user.email,
@@ -277,7 +277,7 @@ def test_entrance_exam_gating_for_staff(self):
         self.client.logout()
         staff_user = StaffFactory(course_key=self.course.id)
         staff_user.is_staff = True
-        self.client.login(username=staff_user.username, password='test')
+        self.client.login(username=staff_user.username, password=self.TEST_PASSWORD)
 
         # assert staff has access to all toc
         self.request.user = staff_user
diff --git a/lms/djangoapps/courseware/tests/test_masquerade.py b/lms/djangoapps/courseware/tests/test_masquerade.py
index 43041b1437e1..9d211b05ea21 100644
--- a/lms/djangoapps/courseware/tests/test_masquerade.py
+++ b/lms/djangoapps/courseware/tests/test_masquerade.py
@@ -88,7 +88,7 @@ def setUp(self):
         super().setUp()
 
         self.test_user = self.create_user()
-        self.login(self.test_user.email, 'test')
+        self.login(self.test_user.email, self.TEST_PASSWORD)
         self.enroll(self.course, True)
 
     def get_courseware_page(self):
@@ -298,12 +298,12 @@ def setUp(self):
     def login_staff(self):
         """ Login as a staff user """
         self.logout()
-        self.login(self.test_user.email, 'test')
+        self.login(self.test_user.email, self.TEST_PASSWORD)
 
     def login_student(self):
         """ Login as a student """
         self.logout()
-        self.login(self.student_user.email, 'test')
+        self.login(self.student_user.email, self.TEST_PASSWORD)
 
     def submit_answer(self, response1, response2):
         """
@@ -351,7 +351,7 @@ def test_masquerade_as_specific_student(self, username):
         student = UserFactory.create(username=username)
         CourseEnrollment.enroll(student, self.course.id)
         self.logout()
-        self.login(student.email, 'test')
+        self.login(student.email, self.TEST_PASSWORD)
         # Answer correctly as the student, and check progress.
         self.submit_answer('Correct', 'Correct')
         assert self.get_progress_detail() == '2/2'
@@ -378,7 +378,7 @@ def test_masquerade_as_specific_student(self, username):
 
         # Verify the student state did not change.
         self.logout()
-        self.login(student.email, 'test')
+        self.login(student.email, self.TEST_PASSWORD)
         assert self.get_progress_detail() == '2/2'
 
     def test_masquerading_with_language_preference(self):
diff --git a/lms/djangoapps/courseware/tests/test_split_module.py b/lms/djangoapps/courseware/tests/test_split_module.py
index 7e6b88718eac..5026f05ca221 100644
--- a/lms/djangoapps/courseware/tests/test_split_module.py
+++ b/lms/djangoapps/courseware/tests/test_split_module.py
@@ -59,7 +59,7 @@ def setUp(self):
 
         self.student = UserFactory.create()
         CourseEnrollmentFactory.create(user=self.student, course_id=self.course.id)
-        self.client.login(username=self.student.username, password='test')
+        self.client.login(username=self.student.username, password=self.TEST_PASSWORD)
 
         self.included_usage_keys = None
         self.excluded_usage_keys = None
@@ -309,7 +309,7 @@ def setUp(self):
 
         self.student = UserFactory.create()
         CourseEnrollmentFactory.create(user=self.student, course_id=self.course.id)
-        self.client.login(username=self.student.username, password='test')
+        self.client.login(username=self.student.username, password=self.TEST_PASSWORD)
 
     def test_changing_position_works(self):
         # Make a mock FieldDataCache for this course, so we can get the course block
diff --git a/lms/djangoapps/courseware/tests/test_submitting_problems.py b/lms/djangoapps/courseware/tests/test_submitting_problems.py
index 8ffcea0298bf..4d55645d7a5f 100644
--- a/lms/djangoapps/courseware/tests/test_submitting_problems.py
+++ b/lms/djangoapps/courseware/tests/test_submitting_problems.py
@@ -154,7 +154,7 @@ def setUp(self):
         # create a test student
         self.course = CourseFactory.create(display_name=self.COURSE_NAME, number=self.COURSE_SLUG)
         self.student = 'view@test.com'
-        self.password = 'foo'
+        self.password = self.TEST_PASSWORD
         self.create_account('u1', self.student, self.password)
         self.activate_user(self.student)
         self.enroll(self.course)
diff --git a/lms/djangoapps/courseware/tests/test_tabs.py b/lms/djangoapps/courseware/tests/test_tabs.py
index db59fa373bc5..6ad7ef73de01 100644
--- a/lms/djangoapps/courseware/tests/test_tabs.py
+++ b/lms/djangoapps/courseware/tests/test_tabs.py
@@ -404,7 +404,7 @@ def test_get_course_tabs_list_skipped_entrance_exam(self):
         # login as instructor hit skip entrance exam api in instructor app
         instructor = InstructorFactory(course_key=self.course.id)
         self.client.logout()
-        self.client.login(username=instructor.username, password='test')
+        self.client.login(username=instructor.username, password=self.TEST_PASSWORD)
 
         url = reverse('mark_student_can_skip_entrance_exam', kwargs={'course_id': str(self.course.id)})
         response = self.client.post(url, {
@@ -426,7 +426,7 @@ def test_course_tabs_list_for_staff_members(self):
         # Login as member of staff
         self.client.logout()
         staff_user = StaffFactory(course_key=self.course.id)
-        self.client.login(username=staff_user.username, password='test')
+        self.client.login(username=staff_user.username, password=self.TEST_PASSWORD)
         course_tab_list = get_course_tab_list(staff_user, self.course)
         assert len(course_tab_list) == 4
 
@@ -685,7 +685,7 @@ def test_course_tabs_staff_only(self):
         # Login as member of staff
         self.client.logout()
         staff_user = StaffFactory(course_key=self.course.id)
-        self.client.login(username=staff_user.username, password='test')
+        self.client.login(username=staff_user.username, password=self.TEST_PASSWORD)
         course_tab_list_staff = get_course_tab_list(staff_user, self.course)
         name_list_staff = [x.name for x in course_tab_list_staff]
         assert 'Static Tab Free' in name_list_staff
diff --git a/lms/djangoapps/courseware/tests/test_video_mongo.py b/lms/djangoapps/courseware/tests/test_video_mongo.py
index fa660f133c74..c1df491f47a4 100644
--- a/lms/djangoapps/courseware/tests/test_video_mongo.py
+++ b/lms/djangoapps/courseware/tests/test_video_mongo.py
@@ -124,6 +124,7 @@ def test_video_constructor(self):
                 'lmsRootURL': settings.LMS_ROOT_URL,
                 'transcriptTranslationUrl': self.get_handler_url('transcript', 'translation/__lang__'),
                 'transcriptAvailableTranslationsUrl': self.get_handler_url('transcript', 'available_translations'),
+                'aiTranslationsUrl': settings.AI_TRANSLATIONS_API_URL,
                 'autohideHtml5': False,
                 'recordedYoutubeIsAvailable': True,
                 'completionEnabled': False,
@@ -138,6 +139,8 @@ def test_video_constructor(self):
                 {'display_name': 'Text (.txt) file', 'value': 'txt'}
             ],
             'poster': 'null',
+            'transcript_feedback_enabled': False,
+            'video_id': '',
         }
 
         mako_service = self.block.runtime.service(self.block, 'mako')
@@ -209,6 +212,7 @@ def test_video_constructor(self):
                 'lmsRootURL': settings.LMS_ROOT_URL,
                 'transcriptTranslationUrl': self.get_handler_url('transcript', 'translation/__lang__'),
                 'transcriptAvailableTranslationsUrl': self.get_handler_url('transcript', 'available_translations'),
+                'aiTranslationsUrl': settings.AI_TRANSLATIONS_API_URL,
                 'autohideHtml5': False,
                 'recordedYoutubeIsAvailable': True,
                 'completionEnabled': False,
@@ -223,6 +227,8 @@ def test_video_constructor(self):
                 {'display_name': 'Text (.txt) file', 'value': 'txt'}
             ],
             'poster': 'null',
+            'transcript_feedback_enabled': False,
+            'video_id': '',
         }
 
         mako_service = self.block.runtime.service(self.block, 'mako')
@@ -365,6 +371,7 @@ def setUp(self):
             'lmsRootURL': settings.LMS_ROOT_URL,
             'transcriptTranslationUrl': self.get_handler_url('transcript', 'translation/__lang__'),
             'transcriptAvailableTranslationsUrl': self.get_handler_url('transcript', 'available_translations'),
+            'aiTranslationsUrl': settings.AI_TRANSLATIONS_API_URL,
             'autohideHtml5': False,
             'recordedYoutubeIsAvailable': True,
             'completionEnabled': False,
@@ -465,6 +472,8 @@ def test_get_html_track(self):
                 {'display_name': 'Text (.txt) file', 'value': 'txt'}
             ],
             'poster': 'null',
+            'transcript_feedback_enabled': False,
+            'video_id': '',
         }
 
         for data in cases:
@@ -595,6 +604,8 @@ def test_get_html_source(self):
                 {'display_name': 'Text (.txt) file', 'value': 'txt'}
             ],
             'poster': 'null',
+            'transcript_feedback_enabled': False,
+            'video_id': '',
         }
         initial_context['metadata']['duration'] = None
 
@@ -707,6 +718,7 @@ def test_get_html_with_mocked_edx_video_id(self):
         metadata = self.default_metadata_dict
         metadata['autoplay'] = False
         metadata['sources'] = ""
+
         initial_context = {
             'autoadvance_enabled': False,
             'branding_info': None,
@@ -730,6 +742,8 @@ def test_get_html_with_mocked_edx_video_id(self):
             ],
             'poster': 'null',
             'metadata': metadata,
+            'transcript_feedback_enabled': False,
+            'video_id': 'mock item',
         }
 
         DATA = SOURCE_XML.format(  # lint-amnesty, pylint: disable=invalid-name
@@ -884,6 +898,7 @@ def helper_get_html_with_edx_video_id(self, data):
         # Video found for edx_video_id
         metadata = self.default_metadata_dict
         metadata['sources'] = ""
+
         initial_context = {
             'autoadvance_enabled': False,
             'branding_info': None,
@@ -907,6 +922,8 @@ def helper_get_html_with_edx_video_id(self, data):
             ],
             'poster': 'null',
             'metadata': metadata,
+            'transcript_feedback_enabled': False,
+            'video_id': data['edx_video_id'].replace('\t', ' '),
         }
 
         # pylint: disable=invalid-name
@@ -1024,6 +1041,8 @@ def side_effect(*args, **kwargs):  # lint-amnesty, pylint: disable=unused-argume
                 {'display_name': 'Text (.txt) file', 'value': 'txt'}
             ],
             'poster': 'null',
+            'transcript_feedback_enabled': False,
+            'video_id': 'vid-v1:12345',
         }
         initial_context['metadata']['duration'] = None
 
@@ -1122,6 +1141,8 @@ def test_get_html_cdn_source_external_video(self):
                 {'display_name': 'Text (.txt) file', 'value': 'txt'}
             ],
             'poster': 'null',
+            'transcript_feedback_enabled': False,
+            'video_id': 'vid-v1:12345',
         }
         initial_context['metadata']['duration'] = None
 
@@ -2336,6 +2357,7 @@ def test_bumper_metadata(self, get_url_for_profiles, get_bumper_settings, is_bum
 
         content = self.block.student_view(None).content
         sources = ['example.mp4', 'example.webm']
+
         expected_context = {
             'autoadvance_enabled': False,
             'branding_info': None,
@@ -2391,6 +2413,7 @@ def test_bumper_metadata(self, get_url_for_profiles, get_bumper_settings, is_bum
                 'lmsRootURL': settings.LMS_ROOT_URL,
                 'transcriptTranslationUrl': self.get_handler_url('transcript', 'translation/__lang__'),
                 'transcriptAvailableTranslationsUrl': self.get_handler_url('transcript', 'available_translations'),
+                'aiTranslationsUrl': settings.AI_TRANSLATIONS_API_URL,
                 'autohideHtml5': False,
                 'recordedYoutubeIsAvailable': True,
                 'completionEnabled': False,
@@ -2407,7 +2430,9 @@ def test_bumper_metadata(self, get_url_for_profiles, get_bumper_settings, is_bum
             'poster': json.dumps(OrderedDict({
                 'url': 'http://img.youtube.com/vi/ZwkTiUPN0mg/0.jpg',
                 'type': 'youtube'
-            }))
+            })),
+            'transcript_feedback_enabled': False,
+            'video_id': '',
         }
 
         mako_service = self.block.runtime.service(self.block, 'mako')
@@ -2431,6 +2456,7 @@ def prepare_expected_context(self, autoadvanceenabled_flag, autoadvance_flag):
         Build a dictionary with data expected by some operations in this test.
         Only parameters related to auto-advance are variable, rest is fixed.
         """
+
         context = {
             'autoadvance_enabled': autoadvanceenabled_flag,
             'branding_info': None,
@@ -2474,6 +2500,7 @@ def prepare_expected_context(self, autoadvanceenabled_flag, autoadvance_flag):
                 'transcriptAvailableTranslationsUrl': self.block.runtime.handler_url(
                     self.block, 'transcript', 'available_translations'
                 ).rstrip('/?'),
+                'aiTranslationsUrl': settings.AI_TRANSLATIONS_API_URL,
                 'autohideHtml5': False,
                 'recordedYoutubeIsAvailable': True,
                 'completionEnabled': False,
@@ -2487,7 +2514,9 @@ def prepare_expected_context(self, autoadvanceenabled_flag, autoadvance_flag):
                 {'display_name': 'SubRip (.srt) file', 'value': 'srt'},
                 {'display_name': 'Text (.txt) file', 'value': 'txt'}
             ],
-            'poster': 'null'
+            'poster': 'null',
+            'transcript_feedback_enabled': False,
+            'video_id': '',
         }
         return context
 
diff --git a/lms/djangoapps/courseware/tests/test_view_authentication.py b/lms/djangoapps/courseware/tests/test_view_authentication.py
index 42f2275e0fd2..67ada18e850e 100644
--- a/lms/djangoapps/courseware/tests/test_view_authentication.py
+++ b/lms/djangoapps/courseware/tests/test_view_authentication.py
@@ -29,7 +29,7 @@ class TestViewAuth(EnterpriseTestConsentRequired, ModuleStoreTestCase, LoginEnro
     Check that view authentication works properly.
     """
 
-    ACCOUNT_INFO = [('view@test.com', 'foo'), ('view2@test.com', 'foo')]
+    ACCOUNT_INFO = [('view@test.com', 'Password1234'), ('view2@test.com', 'Password1234')]
     ENABLED_SIGNALS = ['course_published']
 
     @staticmethod
@@ -111,7 +111,7 @@ def _check_staff(self, course):
         self.assert_request_status_code(302, url)
 
     def login(self, user):  # lint-amnesty, pylint: disable=arguments-differ
-        return super().login(user.email, 'test')
+        return super().login(user.email, self.TEST_PASSWORD)
 
     def setUp(self):
         super().setUp()
diff --git a/lms/djangoapps/courseware/tests/test_views.py b/lms/djangoapps/courseware/tests/test_views.py
index e71f3f07ec0d..bebd4a79fb93 100644
--- a/lms/djangoapps/courseware/tests/test_views.py
+++ b/lms/djangoapps/courseware/tests/test_views.py
@@ -716,7 +716,7 @@ def test_submission_history_accepts_valid_ids(self):
         # log into a staff account
         admin = AdminFactory()
 
-        assert self.client.login(username=admin.username, password='test')
+        assert self.client.login(username=admin.username, password=TEST_PASSWORD)
 
         url = reverse('submission_history', kwargs={
             'course_id': str(self.course_key),
@@ -731,7 +731,7 @@ def test_submission_history_xss(self):
         # log into a staff account
         admin = AdminFactory()
 
-        assert self.client.login(username=admin.username, password='test')
+        assert self.client.login(username=admin.username, password=TEST_PASSWORD)
 
         # try it with an existing user and a malicious location
         url = reverse('submission_history', kwargs={
@@ -755,7 +755,7 @@ def test_submission_history_contents(self):
         # log into a staff account
         admin = AdminFactory.create()
 
-        assert self.client.login(username=admin.username, password='test')
+        assert self.client.login(username=admin.username, password=TEST_PASSWORD)
 
         usage_key = self.course_key.make_usage_key('problem', 'test-history')
         state_client = DjangoXBlockUserStateClient(admin)
@@ -818,7 +818,7 @@ def test_submission_history_timezone(self, timezone, hour_diff):
                 course_key = course.id
                 client = Client()
                 admin = AdminFactory.create()
-                assert client.login(username=admin.username, password='test')
+                assert client.login(username=admin.username, password=TEST_PASSWORD)
                 state_client = DjangoXBlockUserStateClient(admin)
                 usage_key = course_key.make_usage_key('problem', 'test-history')
                 state_client.set(
@@ -1257,7 +1257,7 @@ class ProgressPageBaseTests(ModuleStoreTestCase):
     def setUp(self):
         super().setUp()
         self.user = UserFactory.create()
-        assert self.client.login(username=self.user.username, password='test')
+        assert self.client.login(username=self.user.username, password=TEST_PASSWORD)
 
         self.setup_course()
 
@@ -1356,7 +1356,7 @@ def test_unenrolled_student_progress_for_credit_course(self):
         # Create a new course, a user which will not be enrolled in course, admin user for staff access
         course = CourseFactory.create(default_store=ModuleStoreEnum.Type.split)
         admin = AdminFactory.create()
-        assert self.client.login(username=admin.username, password='test')
+        assert self.client.login(username=admin.username, password=TEST_PASSWORD)
 
         # Create and enable Credit course
         CreditCourse.objects.create(course_key=course.id, enabled=True)
@@ -1650,7 +1650,7 @@ def test_progress_with_course_duration_limits(self, course_mode):
         """
         CourseDurationLimitConfig.objects.create(enabled=True, enabled_as_of=datetime(2018, 1, 1))
         user = UserFactory.create()
-        assert self.client.login(username=user.username, password='test')
+        assert self.client.login(username=user.username, password=TEST_PASSWORD)
         add_course_mode(self.course, mode_slug=CourseMode.AUDIT)
         add_course_mode(self.course)
         CourseEnrollmentFactory(user=user, course_id=self.course.id, mode=course_mode)
@@ -1683,7 +1683,7 @@ def test_progress_without_course_duration_limits(self, course_mode):
         """
         CourseDurationLimitConfig.objects.create(enabled=False)
         user = UserFactory.create()
-        assert self.client.login(username=user.username, password='test')
+        assert self.client.login(username=user.username, password=TEST_PASSWORD)
         CourseModeFactory.create(
             course_id=self.course.id,
             mode_slug=course_mode
@@ -1702,7 +1702,7 @@ def test_message_for_ineligible_mode(self, course_mode):
          in an ineligible mode.
         """
         user = UserFactory.create()
-        assert self.client.login(username=user.username, password='test')
+        assert self.client.login(username=user.username, password=TEST_PASSWORD)
         CourseEnrollmentFactory(user=user, course_id=self.course.id, mode=course_mode)
 
         with patch('lms.djangoapps.grades.course_grade_factory.CourseGradeFactory.read') as mock_create:
@@ -2085,7 +2085,7 @@ def test_progress_page_hide_scores_from_learner(self, show_correctness, due_date
         self.setup_course(show_correctness=show_correctness, due_date=due_date, graded=graded)
         self.add_problem()
 
-        self.client.login(username=self.user.username, password='test')
+        self.client.login(username=self.user.username, password=TEST_PASSWORD)
         resp = self._get_progress_page()
 
         # Ensure that expected text is present
@@ -2137,7 +2137,7 @@ def test_progress_page_hide_scores_from_staff(self, show_correctness, due_date_n
         self.add_problem()
 
         # Login as a course staff user to view the student progress page.
-        self.client.login(username=self.staff_user.username, password='test')
+        self.client.login(username=self.staff_user.username, password=TEST_PASSWORD)
 
         resp = self._get_student_progress_page()
 
@@ -3202,7 +3202,7 @@ class EnterpriseConsentTestCase(EnterpriseTestConsentRequired, ModuleStoreTestCa
     def setUp(self):
         super().setUp()
         self.user = UserFactory.create()
-        assert self.client.login(username=self.user.username, password='test')
+        assert self.client.login(username=self.user.username, password=TEST_PASSWORD)
         self.course = CourseFactory.create()
         CourseOverview.load_from_module_store(self.course.id)
         CourseEnrollmentFactory(user=self.user, course_id=self.course.id)
@@ -3302,7 +3302,7 @@ def test_preview_no_redirect(self):
             # Previews will not redirect to the mfe
             course_staff = UserFactory.create(is_staff=False)
             CourseStaffRole(self.course_key).add_users(course_staff)
-            self.client.login(username=course_staff.username, password='test')
+            self.client.login(username=course_staff.username, password=TEST_PASSWORD)
             assert self.client.get(preview_url).status_code == 200
 
 
@@ -3439,7 +3439,7 @@ def test_course_wide_resources(self, url_name, param, is_instructor, is_rendered
         CourseEnrollmentFactory(user=user, course_id=course.id)
         if is_instructor:
             allow_access(course, user, 'instructor')
-        assert self.client.login(username=user.username, password='test')
+        assert self.client.login(username=user.username, password=TEST_PASSWORD)
 
         kwargs = None
         if param == 'course_id':
diff --git a/lms/djangoapps/courseware/testutils.py b/lms/djangoapps/courseware/testutils.py
index 3c2b946e91df..a18074e9ccbf 100644
--- a/lms/djangoapps/courseware/testutils.py
+++ b/lms/djangoapps/courseware/testutils.py
@@ -81,7 +81,7 @@ def login(self):
         """
         Logs in the test user.
         """
-        self.client.login(username=self.user.username, password='test')
+        self.client.login(username=self.user.username, password='Password1234')
 
     def course_options(self):
         """
diff --git a/lms/djangoapps/discussion/django_comment_client/base/tests.py b/lms/djangoapps/discussion/django_comment_client/base/tests.py
index d450998a60c6..bc4e702886c9 100644
--- a/lms/djangoapps/discussion/django_comment_client/base/tests.py
+++ b/lms/djangoapps/discussion/django_comment_client/base/tests.py
@@ -16,6 +16,7 @@
 from eventtracking.processors.exceptions import EventEmissionExit
 from mock import ANY, Mock, patch
 from opaque_keys.edx.keys import CourseKey
+from openedx_events.learning.signals import FORUM_THREAD_CREATED, FORUM_THREAD_RESPONSE_CREATED, FORUM_RESPONSE_COMMENT_CREATED
 
 from common.djangoapps.course_modes.models import CourseMode
 from common.djangoapps.course_modes.tests.factories import CourseModeFactory
@@ -241,7 +242,7 @@ def set_up_course(self, block_count=0):
         with patch('common.djangoapps.student.models.user.cc.User.save'):
             uname = 'student'
             email = 'student@edx.org'
-            self.password = 'test'
+            self.password = 'Password1234'
 
             # Create the user and make them active so we can log them in.
             self.student = UserFactory.create(username=uname, email=email, password=self.password)
@@ -406,7 +407,7 @@ def inner(self, default_store, block_count, mongo_calls, sql_queries, *args, **k
         return inner
 
     @ddt.data(
-        (ModuleStoreEnum.Type.split, 3, 8, 42),
+        (ModuleStoreEnum.Type.split, 3, 8, 43),
     )
     @ddt.unpack
     @count_queries
@@ -464,7 +465,7 @@ def setUp(self):
         with patch('common.djangoapps.student.models.user.cc.User.save'):
             uname = 'student'
             email = 'student@edx.org'
-            self.password = 'test'
+            self.password = 'Password1234'
 
             # Create the user and make them active so we can log them in.
             self.student = UserFactory.create(username=uname, email=email, password=self.password)
@@ -1735,6 +1736,8 @@ def test_response_event(self, mock_request, mock_emit):
         """
         Check to make sure an event is fired when a user responds to a thread.
         """
+        event_receiver = Mock()
+        FORUM_THREAD_RESPONSE_CREATED.connect(event_receiver)
         self._set_mock_request_data(mock_request, {
             "closed": False,
             "commentable_id": 'test_commentable_id',
@@ -1754,12 +1757,29 @@ def test_response_event(self, mock_request, mock_emit):
         assert event['discussion']['id'] == 'test_thread_id'
         assert event['options']['followed'] is True
 
+        event_receiver.assert_called_once()
+
+        self.assertDictContainsSubset(
+            {
+                "signal": FORUM_THREAD_RESPONSE_CREATED,
+                "sender": None,
+            },
+            event_receiver.call_args.kwargs
+        )
+
+        self.assertIn(
+            "thread",
+            event_receiver.call_args.kwargs
+        )
+
     @patch('eventtracking.tracker.emit')
     @patch('openedx.core.djangoapps.django_comment_common.comment_client.utils.requests.request', autospec=True)
     def test_comment_event(self, mock_request, mock_emit):
         """
         Ensure an event is fired when someone comments on a response.
         """
+        event_receiver = Mock()
+        FORUM_RESPONSE_COMMENT_CREATED.connect(event_receiver)
         self._set_mock_request_data(mock_request, {
             "closed": False,
             "depth": 1,
@@ -1781,6 +1801,19 @@ def test_comment_event(self, mock_request, mock_emit):
         assert event['user_course_roles'] == ['Wizard']
         assert event['options']['followed'] is False
 
+        self.assertDictContainsSubset(
+            {
+                "signal": FORUM_RESPONSE_COMMENT_CREATED,
+                "sender": None,
+            },
+            event_receiver.call_args.kwargs
+        )
+
+        self.assertIn(
+            "thread",
+            event_receiver.call_args.kwargs
+        )
+
     @patch('eventtracking.tracker.emit')
     @patch('openedx.core.djangoapps.django_comment_common.comment_client.utils.requests.request', autospec=True)
     @ddt.data((
@@ -1809,6 +1842,10 @@ def test_team_events(self, view_name, event_name, view_data, view_kwargs, mock_r
         team = CourseTeamFactory.create(discussion_topic_id=TEAM_COMMENTABLE_ID)
         CourseTeamMembershipFactory.create(team=team, user=user)
 
+        event_receiver = Mock()
+        forum_event = views.TRACKING_LOG_TO_EVENT_MAPS.get(event_name)
+        forum_event.connect(event_receiver)
+
         self._set_mock_request_data(mock_request, {
             'closed': False,
             'commentable_id': TEAM_COMMENTABLE_ID,
@@ -1825,6 +1862,19 @@ def test_team_events(self, view_name, event_name, view_data, view_kwargs, mock_r
         assert name == event_name
         assert event['team_id'] == team.team_id
 
+        self.assertDictContainsSubset(
+            {
+                "signal": forum_event,
+                "sender": None,
+            },
+            event_receiver.call_args.kwargs
+        )
+
+        self.assertIn(
+            "thread",
+            event_receiver.call_args.kwargs
+        )
+
     @ddt.data(
         ('vote_for_thread', 'thread_id', 'thread'),
         ('undo_vote_for_thread', 'thread_id', 'thread'),
@@ -1859,6 +1909,43 @@ def test_thread_voted_event(self, view_name, obj_id_name, obj_type, mock_request
         assert event['undo_vote'] == undo
         assert event['vote_value'] == 'up'
 
+    @ddt.data('follow_thread', 'unfollow_thread',)
+    @patch('eventtracking.tracker.emit')
+    @patch('openedx.core.djangoapps.django_comment_common.comment_client.utils.requests.request', autospec=True)
+    def test_thread_followed_event(self, view_name, mock_request, mock_emit):
+        event_receiver = Mock()
+        for signal in views.TRACKING_LOG_TO_EVENT_MAPS.values():
+            signal.connect(event_receiver)
+
+        self._set_mock_request_data(mock_request, {
+            'closed': False,
+            'commentable_id': 'test_commentable_id',
+            'username': 'test_user',
+        })
+        request = RequestFactory().post('dummy_url', {})
+        request.user = self.student
+        request.view_name = view_name
+        view_function = getattr(views, view_name)
+        kwargs = dict(course_id=str(self.course.id))
+        kwargs['thread_id'] = 'thread_id'
+        view_function(request, **kwargs)
+
+        assert mock_emit.called
+        event_name, event_data = mock_emit.call_args[0]
+        action_name = 'followed' if view_name == 'follow_thread' else 'unfollowed'
+        expected_action_value = True if view_name == 'follow_thread' else False
+        assert event_name == f'edx.forum.thread.{action_name}'
+        assert event_data['commentable_id'] == 'test_commentable_id'
+        assert event_data['id'] == 'thread_id'
+        assert event_data['followed'] == expected_action_value
+        assert event_data['user_forums_roles'] == ['Student']
+        assert event_data['user_course_roles'] == ['Wizard']
+
+        # In case of events that doesn't have a correspondig Open edX events signal
+        # we need to check that none of the openedx signals is called.
+        # This is tested for all the events that are not tested above.
+        event_receiver.assert_not_called()
+
 
 class UsersEndpointTestCase(ForumsEnableMixin, SharedModuleStoreTestCase, MockRequestSetupMixin):
 
diff --git a/lms/djangoapps/discussion/django_comment_client/base/views.py b/lms/djangoapps/discussion/django_comment_client/base/views.py
index 5ad3dae8992b..f81322a2380e 100644
--- a/lms/djangoapps/discussion/django_comment_client/base/views.py
+++ b/lms/djangoapps/discussion/django_comment_client/base/views.py
@@ -16,12 +16,18 @@
 from django.views.decorators.http import require_GET, require_POST
 from eventtracking import tracker
 from opaque_keys.edx.keys import CourseKey
+from openedx_events.learning.data import DiscussionThreadData, UserData, UserPersonalData
+from openedx_events.learning.signals import (
+    FORUM_RESPONSE_COMMENT_CREATED,
+    FORUM_THREAD_CREATED,
+    FORUM_THREAD_RESPONSE_CREATED
+)
 
 import lms.djangoapps.discussion.django_comment_client.settings as cc_settings
 import openedx.core.djangoapps.django_comment_common.comment_client as cc
 from common.djangoapps.student.roles import GlobalStaff
-from common.djangoapps.util.file import store_uploaded_file
 from common.djangoapps.track import contexts
+from common.djangoapps.util.file import store_uploaded_file
 from lms.djangoapps.courseware.access import has_access
 from lms.djangoapps.courseware.courses import get_course_overview_with_access, get_course_with_access
 from lms.djangoapps.courseware.exceptions import CourseAccessRedirect
@@ -42,7 +48,7 @@
     get_user_group_ids,
     is_comment_too_deep,
     prepare_content,
-    sanitize_body,
+    sanitize_body
 )
 from openedx.core.djangoapps.django_comment_common.signals import (
     comment_created,
@@ -66,6 +72,12 @@
 TRACKING_MAX_FORUM_TITLE = 1000
 _EVENT_NAME_TEMPLATE = 'edx.forum.{obj_type}.{action_name}'
 
+TRACKING_LOG_TO_EVENT_MAPS = {
+    'edx.forum.thread.created': FORUM_THREAD_CREATED,
+    'edx.forum.response.created': FORUM_THREAD_RESPONSE_CREATED,
+    'edx.forum.comment.created': FORUM_RESPONSE_COMMENT_CREATED,
+}
+
 
 def track_forum_event(request, event_name, course, obj, data, id_map=None):
     """
@@ -97,6 +109,41 @@ def track_forum_event(request, event_name, course, obj, data, id_map=None):
     with tracker.get_tracker().context(event_name, context):
         tracker.emit(event_name, data)
 
+    forum_event = TRACKING_LOG_TO_EVENT_MAPS.get(event_name, None)
+    if forum_event is not None:
+        forum_event.send_event(
+            thread=DiscussionThreadData(
+                anonymous=data.get('anonymous'),
+                anonymous_to_peers=data.get('anonymous_to_peers'),
+                body=data.get('body'),
+                category_id=data.get('category_id'),
+                category_name=data.get('category_name'),
+                commentable_id=data.get('commentable_id'),
+                group_id=data.get('group_id'),
+                id=data.get('id'),
+                team_id=data.get('team_id'),
+                thread_type=data.get('thread_type'),
+                title=data.get('title'),
+                title_truncated=data.get('title_truncated'),
+                truncated=data.get('truncated'),
+                url=data.get('url'),
+                discussion=data.get('discussion'),
+                user_course_roles=data.get('user_course_roles'),
+                user_forums_roles=data.get('user_forums_roles'),
+                user=UserData(
+                    pii=UserPersonalData(
+                        username=user.username,
+                        email=user.email,
+                        name=user.profile.name,
+                    ),
+                    id=user.id,
+                    is_active=user.is_active,
+                ),
+                course_id=str(course.id),
+                options=data.get('options'),
+            )
+        )
+
 
 def track_created_event(request, event_name, course, obj, data):
     """
@@ -134,6 +181,20 @@ def track_thread_created_event(request, course, thread, followed, from_mfe_sideb
     track_created_event(request, event_name, course, thread, event_data)
 
 
+def track_thread_followed_event(request, course, thread, followed):
+    """
+    Send analytics event for a newly followed/unfollowed thread.
+    """
+    action_name = 'followed' if followed else 'unfollowed'
+    event_name = _EVENT_NAME_TEMPLATE.format(obj_type='thread', action_name=action_name)
+    event_data = {
+        'commentable_id': thread.commentable_id,
+        'id': thread.id,
+        'followed': followed,
+    }
+    track_forum_event(request, event_name, course, thread, event_data)
+
+
 def track_comment_created_event(request, course, comment, commentable_id, followed, from_mfe_sidebar=False):
     """
     Send analytics event for a newly created response or comment.
@@ -938,9 +999,12 @@ def un_pin_thread(request, course_id, thread_id):
 @permitted
 def follow_thread(request, course_id, thread_id):  # lint-amnesty, pylint: disable=missing-function-docstring, unused-argument
     user = cc.User.from_django_user(request.user)
+    course_key = CourseKey.from_string(course_id)
+    course = get_course_by_id(course_key)
     thread = cc.Thread.find(thread_id)
     user.follow(thread)
     thread_followed.send(sender=None, user=request.user, post=thread)
+    track_thread_followed_event(request, course, thread, True)
     return JsonResponse({})
 
 
@@ -966,10 +1030,13 @@ def unfollow_thread(request, course_id, thread_id):  # lint-amnesty, pylint: dis
     given a course id and thread id, stop following this thread
     ajax only
     """
+    course_key = CourseKey.from_string(course_id)
+    course = get_course_by_id(course_key)
     user = cc.User.from_django_user(request.user)
     thread = cc.Thread.find(thread_id)
     user.unfollow(thread)
     thread_unfollowed.send(sender=None, user=request.user, post=thread)
+    track_thread_followed_event(request, course, thread, False)
     return JsonResponse({})
 
 
diff --git a/lms/djangoapps/discussion/rest_api/api.py b/lms/djangoapps/discussion/rest_api/api.py
index f79cd663718b..54878d69ca37 100644
--- a/lms/djangoapps/discussion/rest_api/api.py
+++ b/lms/djangoapps/discussion/rest_api/api.py
@@ -93,7 +93,7 @@
     track_voted_event,
     track_discussion_reported_event,
     track_discussion_unreported_event,
-    track_forum_search_event
+    track_forum_search_event, track_thread_followed_event
 )
 from ..django_comment_client.utils import (
     get_group_id_for_user,
@@ -1333,7 +1333,7 @@ def _do_extra_actions(api_content, cc_content, request_fields, actions_form, con
         if field in request_fields and field in api_content and form_value != api_content[field]:
             api_content[field] = form_value
             if field == "following":
-                _handle_following_field(form_value, context["cc_requester"], cc_content)
+                _handle_following_field(form_value, context["cc_requester"], cc_content, request)
             elif field == "abuse_flagged":
                 _handle_abuse_flagged_field(form_value, context["cc_requester"], cc_content, request)
             elif field == "voted":
@@ -1346,12 +1346,15 @@ def _do_extra_actions(api_content, cc_content, request_fields, actions_form, con
                 raise ValidationError({field: ["Invalid Key"]})
 
 
-def _handle_following_field(form_value, user, cc_content):
+def _handle_following_field(form_value, user, cc_content, request):
     """follow/unfollow thread for the user"""
+    course_key = CourseKey.from_string(cc_content.course_id)
+    course = get_course_with_access(request.user, 'load', course_key)
     if form_value:
         user.follow(cc_content)
     else:
         user.unfollow(cc_content)
+    track_thread_followed_event(request, course, cc_content, form_value)
 
 
 def _handle_abuse_flagged_field(form_value, user, cc_content, request):
diff --git a/lms/djangoapps/discussion/rest_api/discussions_notifications.py b/lms/djangoapps/discussion/rest_api/discussions_notifications.py
index f3a5e3d61d95..7913ce429ff9 100644
--- a/lms/djangoapps/discussion/rest_api/discussions_notifications.py
+++ b/lms/djangoapps/discussion/rest_api/discussions_notifications.py
@@ -52,6 +52,7 @@ def _send_notification(self, user_ids, notification_type, extra_context=None):
                 "replier_name": self.creator.username,
                 "post_title": self.thread.title,
                 "course_name": self.course.display_name,
+                "sender_id": self.creator.id,
                 **extra_context,
             },
             notification_type=notification_type,
diff --git a/lms/djangoapps/discussion/rest_api/tasks.py b/lms/djangoapps/discussion/rest_api/tasks.py
index f5bb20c3d859..385e2a1f46a0 100644
--- a/lms/djangoapps/discussion/rest_api/tasks.py
+++ b/lms/djangoapps/discussion/rest_api/tasks.py
@@ -7,7 +7,7 @@
 from opaque_keys.edx.locator import CourseKey
 from lms.djangoapps.courseware.courses import get_course_with_access
 from openedx.core.djangoapps.django_comment_common.comment_client.thread import Thread
-from openedx.core.djangoapps.notifications.config.waffle import ENABLE_NOTIFICATIONS
+from openedx.core.djangoapps.notifications.config.waffle import ENABLE_NOTIFICATIONS, ENABLE_COURSEWIDE_NOTIFICATIONS
 from lms.djangoapps.discussion.rest_api.discussions_notifications import DiscussionNotificationSender
 
 
@@ -21,7 +21,7 @@ def send_thread_created_notification(thread_id, course_key_str, user_id):
     Send notification when a new thread is created
     """
     course_key = CourseKey.from_string(course_key_str)
-    if not ENABLE_NOTIFICATIONS.is_enabled(course_key):
+    if not (ENABLE_NOTIFICATIONS.is_enabled(course_key) and ENABLE_COURSEWIDE_NOTIFICATIONS.is_enabled(course_key)):
         return
     thread = Thread(id=thread_id).retrieve()
     user = User.objects.get(id=user_id)
diff --git a/lms/djangoapps/discussion/rest_api/tests/test_api.py b/lms/djangoapps/discussion/rest_api/tests/test_api.py
index 1193384bfbd0..98c27feb58c1 100644
--- a/lms/djangoapps/discussion/rest_api/tests/test_api.py
+++ b/lms/djangoapps/discussion/rest_api/tests/test_api.py
@@ -2709,7 +2709,8 @@ def test_author_only_fields(self, role_name):
 
     @ddt.data(*itertools.product([True, False], [True, False]))
     @ddt.unpack
-    def test_following(self, old_following, new_following):
+    @mock.patch("eventtracking.tracker.emit")
+    def test_following(self, old_following, new_following, mock_emit):
         """
         Test attempts to edit the "following" field.
 
@@ -2739,6 +2740,13 @@ def test_following(self, old_following, new_following):
             )
             request_data.pop("request_id", None)
             assert request_data == {'source_type': ['thread'], 'source_id': ['test_thread']}
+            event_name, event_data = mock_emit.call_args[0]
+            expected_event_action = 'followed' if new_following else 'unfollowed'
+            assert event_name == f'edx.forum.thread.{expected_event_action}'
+            assert event_data['commentable_id'] == 'original_topic'
+            assert event_data['id'] == 'test_thread'
+            assert event_data['followed'] == new_following
+            assert event_data['user_forums_roles'] == ['Student']
 
     @ddt.data(*itertools.product([True, False], [True, False]))
     @ddt.unpack
diff --git a/lms/djangoapps/discussion/rest_api/tests/test_tasks.py b/lms/djangoapps/discussion/rest_api/tests/test_tasks.py
index 896e237f5f15..2046aa808c5e 100644
--- a/lms/djangoapps/discussion/rest_api/tests/test_tasks.py
+++ b/lms/djangoapps/discussion/rest_api/tests/test_tasks.py
@@ -25,7 +25,7 @@
     FORUM_ROLE_STUDENT,
     CourseDiscussionSettings
 )
-from openedx.core.djangoapps.notifications.config.waffle import ENABLE_NOTIFICATIONS
+from openedx.core.djangoapps.notifications.config.waffle import ENABLE_COURSEWIDE_NOTIFICATIONS, ENABLE_NOTIFICATIONS
 from xmodule.modulestore.tests.django_utils import ModuleStoreTestCase
 from xmodule.modulestore.tests.factories import CourseFactory
 
@@ -44,6 +44,7 @@ def _get_mfe_url(course_id, post_id):
 @httpretty.activate
 @mock.patch.dict("django.conf.settings.FEATURES", {"ENABLE_DISCUSSION_SERVICE": True})
 @override_waffle_flag(ENABLE_NOTIFICATIONS, active=True)
+@override_waffle_flag(ENABLE_COURSEWIDE_NOTIFICATIONS, active=True)
 class TestNewThreadCreatedNotification(DiscussionAPIViewTestMixin, ModuleStoreTestCase):
     """
     Test cases related to new_discussion_post and new_question_post notification types
@@ -307,6 +308,7 @@ def test_send_notification_to_thread_creator(self):
             'replier_name': self.user_2.username,
             'post_title': 'test thread',
             'course_name': self.course.display_name,
+            'sender_id': self.user_2.id
         }
         self.assertDictEqual(args.context, expected_context)
         self.assertEqual(
@@ -344,6 +346,7 @@ def test_send_notification_to_parent_threads(self):
             'post_title': self.thread.title,
             'author_name': 'dummy\'s',
             'course_name': self.course.display_name,
+            'sender_id': self.user_3.id
         }
         self.assertDictEqual(args_comment.context, expected_context)
         self.assertEqual(
@@ -359,6 +362,7 @@ def test_send_notification_to_parent_threads(self):
             'replier_name': self.user_3.username,
             'post_title': self.thread.title,
             'course_name': self.course.display_name,
+            'sender_id': self.user_3.id
         }
         self.assertDictEqual(args_comment_on_response.context, expected_context)
         self.assertEqual(
@@ -404,6 +408,7 @@ def test_comment_creators_own_response(self):
             'post_title': self.thread.title,
             'author_name': 'your',
             'course_name': self.course.display_name,
+            'sender_id': self.user_3.id,
         }
         self.assertDictEqual(args_comment.context, expected_context)
         self.assertEqual(
@@ -440,6 +445,7 @@ def test_send_notification_to_followers(self, parent_id, notification_type):
             'replier_name': self.user_2.username,
             'post_title': 'test thread',
             'course_name': self.course.display_name,
+            'sender_id': self.user_2.id,
         }
         if parent_id:
             expected_context['author_name'] = 'dummy'
diff --git a/lms/djangoapps/discussion/rest_api/tests/test_views.py b/lms/djangoapps/discussion/rest_api/tests/test_views.py
index 6ac64f161a95..7f6fa5772585 100644
--- a/lms/djangoapps/discussion/rest_api/tests/test_views.py
+++ b/lms/djangoapps/discussion/rest_api/tests/test_views.py
@@ -87,7 +87,7 @@ def setUp(self):
             start=datetime.now(UTC),
             discussion_topics={"Test Topic": {"id": "test_topic"}}
         )
-        self.password = "password"
+        self.password = "Password1234"
         self.user = UserFactory.create(password=self.password)
         # Ensure that parental controls don't apply to this user
         self.user.profile.year_of_birth = 1970
@@ -168,7 +168,7 @@ def setUp(self):
                 content_type="image/jpeg",
             ),
         }
-        self.user = UserFactory.create(password="password")
+        self.user = UserFactory.create(password=self.TEST_PASSWORD)
         self.course = CourseFactory.create(org='a', course='b', run='c', start=datetime.now(UTC))
         self.url = reverse("upload_file", kwargs={"course_id": str(self.course.id)})
 
@@ -176,7 +176,7 @@ def user_login(self):
         """
         Authenticates the test client with the example user.
         """
-        self.client.login(username=self.user.username, password="password")
+        self.client.login(username=self.user.username, password=self.TEST_PASSWORD)
 
     def enroll_user_in_course(self):
         """
@@ -320,10 +320,10 @@ def setUp(self):
         self.addCleanup(httpretty.reset)
         self.addCleanup(httpretty.disable)
 
-        self.user = UserFactory.create(password="password")
+        self.user = UserFactory.create(password=self.TEST_PASSWORD)
         self.register_get_user_response(self.user)
 
-        self.other_user = UserFactory.create(password="password")
+        self.other_user = UserFactory.create(password=self.TEST_PASSWORD)
         self.register_get_user_response(self.other_user)
 
         self.course = CourseFactory.create(org="a", course="b", run="c", start=datetime.now(UTC))
@@ -405,7 +405,7 @@ def test_request_by_unauthorized_user(self):
         they're not either enrolled or staff members.
         """
         self.register_mock_endpoints()
-        self.client.login(username=self.other_user.username, password="password")
+        self.client.login(username=self.other_user.username, password=self.TEST_PASSWORD)
         response = self.client.get(self.url)
         assert response.status_code == status.HTTP_404_NOT_FOUND
         assert json.loads(response.content)["developer_message"] == "Course not found."
@@ -416,7 +416,7 @@ def test_request_by_enrolled_user(self):
         comments in that course.
         """
         self.register_mock_endpoints()
-        self.client.login(username=self.other_user.username, password="password")
+        self.client.login(username=self.other_user.username, password=self.TEST_PASSWORD)
         CourseEnrollmentFactory.create(user=self.other_user, course_id=self.course.id)
         self.assert_successful_response(self.client.get(self.url))
 
@@ -425,7 +425,7 @@ def test_request_by_global_staff(self):
         Staff users are allowed to get any user's comments.
         """
         self.register_mock_endpoints()
-        self.client.login(username=self.other_user.username, password="password")
+        self.client.login(username=self.other_user.username, password=self.TEST_PASSWORD)
         GlobalStaff().add_users(self.other_user)
         self.assert_successful_response(self.client.get(self.url))
 
@@ -436,7 +436,7 @@ def test_request_by_course_staff(self, role):
         course.
         """
         self.register_mock_endpoints()
-        self.client.login(username=self.other_user.username, password="password")
+        self.client.login(username=self.other_user.username, password=self.TEST_PASSWORD)
         role(course_key=self.course.id).add_users(self.other_user)
         self.assert_successful_response(self.client.get(self.url))
 
@@ -445,7 +445,7 @@ def test_request_with_non_existent_user(self):
         Requests for users that don't exist result in a 404 response.
         """
         self.register_mock_endpoints()
-        self.client.login(username=self.other_user.username, password="password")
+        self.client.login(username=self.other_user.username, password=self.TEST_PASSWORD)
         GlobalStaff().add_users(self.other_user)
         url = self.build_url("non_existent", self.course.id)
         response = self.client.get(url)
@@ -456,7 +456,7 @@ def test_request_with_non_existent_course(self):
         Requests for courses that don't exist result in a 404 response.
         """
         self.register_mock_endpoints()
-        self.client.login(username=self.other_user.username, password="password")
+        self.client.login(username=self.other_user.username, password=self.TEST_PASSWORD)
         GlobalStaff().add_users(self.other_user)
         url = self.build_url(self.user.username, "course-v1:x+y+z")
         response = self.client.get(url)
@@ -467,7 +467,7 @@ def test_request_with_invalid_course_id(self):
         Requests with invalid course ID should fail form validation.
         """
         self.register_mock_endpoints()
-        self.client.login(username=self.other_user.username, password="password")
+        self.client.login(username=self.other_user.username, password=self.TEST_PASSWORD)
         GlobalStaff().add_users(self.other_user)
         url = self.build_url(self.user.username, "an invalid course")
         response = self.client.get(url)
@@ -484,7 +484,7 @@ def test_request_with_empty_results_page(self):
         self.register_get_threads_response(threads=[], page=1, num_pages=1)
         self.register_get_comments_response(comments=[], page=1, num_pages=1)
 
-        self.client.login(username=self.other_user.username, password="password")
+        self.client.login(username=self.other_user.username, password=self.TEST_PASSWORD)
         GlobalStaff().add_users(self.other_user)
         url = self.build_url(self.user.username, self.course.id, page=2)
         response = self.client.get(url)
@@ -929,7 +929,7 @@ class CourseTopicsViewV3Test(DiscussionAPIViewTestMixin, CommentsServiceMockMixi
     """
     def setUp(self) -> None:
         super().setUp()
-        self.password = "password"
+        self.password = self.TEST_PASSWORD
         self.user = UserFactory.create(password=self.password)
         self.client.login(username=self.user.username, password=self.password)
         self.staff = AdminFactory.create()
@@ -2759,7 +2759,7 @@ def setUp(self):
             discussion_topics={"Test Topic": {"id": "test_topic"}}
         )
         self.path = reverse('discussion_course_settings', kwargs={'course_id': str(self.course.id)})
-        self.password = 'edx'
+        self.password = self.TEST_PASSWORD
         self.user = UserFactory(username='staff', password=self.password, is_staff=True)
 
     def _get_oauth_headers(self, user):
@@ -3057,7 +3057,7 @@ def setUp(self):
             run="z",
             start=datetime.now(UTC),
         )
-        self.password = 'edx'
+        self.password = self.TEST_PASSWORD
         self.user = UserFactory(username='staff', password=self.password, is_staff=True)
         course_key = CourseKey.from_string('course-v1:x+y+z')
         seed_permissions_roles(course_key)
@@ -3265,7 +3265,7 @@ def setUp(self) -> None:
             user = UserFactory.create(
                 username=stat['username'],
                 email=f"{stat['username']}@example.com",
-                password='12345'
+                password=self.TEST_PASSWORD
             )
             CourseEnrollment.enroll(user, self.course.id, mode='audit')
 
@@ -3279,7 +3279,7 @@ def test_regular_user(self):
         """
         Tests that for a regular user stats are returned without flag counts
         """
-        self.client.login(username=self.user.username, password='test')
+        self.client.login(username=self.user.username, password=self.TEST_PASSWORD)
         response = self.client.get(self.url)
         data = response.json()
         assert data["results"] == self.stats_without_flags
@@ -3289,7 +3289,7 @@ def test_moderator_user(self):
         """
         Tests that for a moderator user stats are returned with flag counts
         """
-        self.client.login(username=self.moderator.username, password='test')
+        self.client.login(username=self.moderator.username, password=self.TEST_PASSWORD)
         response = self.client.get(self.url)
         data = response.json()
         assert data["results"] == self.stats
@@ -3309,7 +3309,7 @@ def test_sorting(self, username, ordering_requested, ordering_performed):
         """
         Test valid sorting options and defaults
         """
-        self.client.login(username=username, password='test')
+        self.client.login(username=username, password=self.TEST_PASSWORD)
         params = {}
         if ordering_requested:
             params = {"order_by": ordering_requested}
@@ -3327,7 +3327,7 @@ def test_sorting_error_regular_user(self, order_by):
         """
         Test for invalid sorting options for regular users.
         """
-        self.client.login(username=self.user.username, password='test')
+        self.client.login(username=self.user.username, password=self.TEST_PASSWORD)
         response = self.client.get(self.url, {"order_by": order_by})
         assert "order_by" in response.json()["field_errors"]
 
@@ -3342,7 +3342,7 @@ def test_with_username_param(self, username_search_string, comma_separated_usern
         Test for endpoint with username param.
         """
         params = {'username': username_search_string}
-        self.client.login(username=self.moderator.username, password='test')
+        self.client.login(username=self.moderator.username, password=self.TEST_PASSWORD)
         self.client.get(self.url, params)
         assert urlparse(
             httpretty.last_request().path  # lint-amnesty, pylint: disable=no-member
@@ -3357,7 +3357,7 @@ def test_with_username_param_with_no_matches(self):
         Test for endpoint with username param with no matches.
         """
         params = {'username': 'unknown'}
-        self.client.login(username=self.moderator.username, password='test')
+        self.client.login(username=self.moderator.username, password=self.TEST_PASSWORD)
         response = self.client.get(self.url, params)
         data = response.json()
         self.assertFalse(data['results'])
diff --git a/lms/djangoapps/discussion/tests/test_views.py b/lms/djangoapps/discussion/tests/test_views.py
index ada3db7792e2..e0d3b869da3d 100644
--- a/lms/djangoapps/discussion/tests/test_views.py
+++ b/lms/djangoapps/discussion/tests/test_views.py
@@ -463,7 +463,7 @@ def test_private_team_thread_html(self, mock_request):
         CourseTeamFactory.create(discussion_topic_id=discussion_topic_id)
         user_not_in_team = UserFactory.create()
         CourseEnrollmentFactory.create(user=user_not_in_team, course_id=self.course.id)
-        self.client.login(username=user_not_in_team.username, password='test')
+        self.client.login(username=user_not_in_team.username, password=self.TEST_PASSWORD)
 
         mock_request.side_effect = make_mock_request_impl(
             course=self.course,
@@ -624,7 +624,7 @@ def test_ajax(self, mock_request):
     def test_html(self, mock_request):
         _mock_text, mock_thread_id = self._create_mock_cohorted_thread(mock_request)
 
-        self.client.login(username=self.student.username, password='test')
+        self.client.login(username=self.student.username, password=self.TEST_PASSWORD)
         response = self.client.get(
             reverse('single_thread', kwargs={
                 'course_id': str(self.course.id),
@@ -758,7 +758,7 @@ def call_view(self, mock_request, commentable_id, user, group_id, pass_group_id=
         if is_ajax:
             headers['HTTP_X_REQUESTED_WITH'] = "XMLHttpRequest"
 
-        self.client.login(username=user.username, password='test')
+        self.client.login(username=user.username, password=self.TEST_PASSWORD)
 
         return self.client.get(
             reverse('single_thread', args=[str(self.course.id), commentable_id, "dummy_thread_id"]),
@@ -824,7 +824,7 @@ def call_view(self, mock_request, user):  # lint-amnesty, pylint: disable=missin
             text="dummy content",
             thread_list=self.thread_list
         )
-        self.client.login(username=user.username, password='test')
+        self.client.login(username=user.username, password=self.TEST_PASSWORD)
         return self.client.get(
             reverse("forum_form_discussion", args=[str(self.course.id)]),
             HTTP_X_REQUESTED_WITH="XMLHttpRequest"
@@ -889,7 +889,7 @@ def assert_can_access(self, user, discussion_id, thread_id, should_have_access):
         verify that the user does not have access to that thread.
         """
         def call_single_thread():
-            self.client.login(username=user.username, password='test')
+            self.client.login(username=user.username, password=self.TEST_PASSWORD)
             return self.client.get(
                 reverse('single_thread', args=[str(self.course.id), discussion_id, thread_id])
             )
@@ -1113,7 +1113,7 @@ def call_view(self, mock_request, commentable_id, user, group_id, pass_group_id=
         if is_ajax:
             headers['HTTP_X_REQUESTED_WITH'] = "XMLHttpRequest"
 
-        self.client.login(username=user.username, password='test')
+        self.client.login(username=user.username, password=self.TEST_PASSWORD)
         return self.client.get(
             reverse("forum_form_discussion", args=[str(self.course.id)]),
             data=request_data,
@@ -1165,7 +1165,7 @@ def call_view_for_profiled_user(
         if is_ajax:
             headers['HTTP_X_REQUESTED_WITH'] = "XMLHttpRequest"
 
-        self.client.login(username=requesting_user.username, password='test')
+        self.client.login(username=requesting_user.username, password=self.TEST_PASSWORD)
         return self.client.get(
             reverse('user_profile', args=[str(self.course.id), profiled_user.id]),
             data=request_data,
@@ -1414,7 +1414,7 @@ def get_response(self, mock_request, params, **headers):  # lint-amnesty, pylint
         mock_request.side_effect = make_mock_request_impl(
             course=self.course, text=self.TEST_THREAD_TEXT, thread_id=self.TEST_THREAD_ID
         )
-        self.client.login(username=self.student.username, password='test')
+        self.client.login(username=self.student.username, password=self.TEST_PASSWORD)
 
         response = self.client.get(
             reverse('user_profile', kwargs={
@@ -2300,7 +2300,7 @@ def test_redirect_from_legacy_base_url_to_new_experience(self):
         """
 
         with override_waffle_flag(ENABLE_DISCUSSIONS_MFE, True):
-            self.client.login(username=self.user.username, password='test')
+            self.client.login(username=self.user.username, password=self.TEST_PASSWORD)
             url = reverse("forum_form_discussion", args=[self.course.id])
             response = self.client.get(url)
             assert response.status_code == 302
@@ -2315,7 +2315,7 @@ def test_redirect_from_legacy_profile_url_to_new_experience(self):
         """
 
         with override_waffle_flag(ENABLE_DISCUSSIONS_MFE, True):
-            self.client.login(username=self.user.username, password='test')
+            self.client.login(username=self.user.username, password=self.TEST_PASSWORD)
             url = reverse("user_profile", args=[self.course.id, self.user.id])
             response = self.client.get(url)
             assert response.status_code == 302
@@ -2330,7 +2330,7 @@ def test_redirect_from_legacy_single_thread_to_new_experience(self):
         """
 
         with override_waffle_flag(ENABLE_DISCUSSIONS_MFE, True):
-            self.client.login(username=self.user.username, password='test')
+            self.client.login(username=self.user.username, password=self.TEST_PASSWORD)
             url = reverse("single_thread", args=[self.course.id, "test_discussion", "test_thread"])
             response = self.client.get(url)
             assert response.status_code == 302
diff --git a/lms/djangoapps/grades/rest_api/v1/tests/mixins.py b/lms/djangoapps/grades/rest_api/v1/tests/mixins.py
index e5e7f269e3a2..1d3a6a0b4551 100644
--- a/lms/djangoapps/grades/rest_api/v1/tests/mixins.py
+++ b/lms/djangoapps/grades/rest_api/v1/tests/mixins.py
@@ -97,7 +97,7 @@ def _create_user_program_enrollments(self, *users, **kwargs):  # lint-amnesty, p
 
     def setUp(self):
         super().setUp()
-        self.password = 'test'
+        self.password = self.TEST_PASSWORD
         self.global_staff = GlobalStaffFactory.create()
         self.student = UserFactory(password=self.password, username='student', email='student@example.com')
         self.other_student = UserFactory(
diff --git a/lms/djangoapps/grades/rest_api/v1/tests/test_views.py b/lms/djangoapps/grades/rest_api/v1/tests/test_views.py
index 1fbfb6070dd3..cd2107ec7c29 100644
--- a/lms/djangoapps/grades/rest_api/v1/tests/test_views.py
+++ b/lms/djangoapps/grades/rest_api/v1/tests/test_views.py
@@ -548,7 +548,7 @@ class CourseSubmissionHistoryWithDataTest(TestSubmittingProblems):
     def setUp(self):
         super().setUp()
         self.namespaced_url = 'grades_api:v1:submission_history'
-        self.password = 'test'
+        self.password = self.TEST_PASSWORD
         self.basic_setup()
         self.global_staff = GlobalStaffFactory.create()
 
diff --git a/lms/djangoapps/grades/tests/integration/test_access.py b/lms/djangoapps/grades/tests/integration/test_access.py
index 380962b19e99..6545094a3ce5 100644
--- a/lms/djangoapps/grades/tests/integration/test_access.py
+++ b/lms/djangoapps/grades/tests/integration/test_access.py
@@ -73,9 +73,9 @@ def setUp(self):
         self.addCleanup(set_current_request, None)
         self.request = get_mock_request(UserFactory())
         self.student = self.request.user
-        self.client.login(username=self.student.username, password="test")
+        self.client.login(username=self.student.username, password=self.TEST_PASSWORD)
         CourseEnrollment.enroll(self.student, self.course.id)
-        self.instructor = UserFactory.create(is_staff=True, username='test_instructor', password='test')
+        self.instructor = UserFactory.create(is_staff=True, username='test_instructor', password=self.TEST_PASSWORD)
         self.refresh_course()
 
     def test_subsection_access_changed(self):
diff --git a/lms/djangoapps/grades/tests/integration/test_events.py b/lms/djangoapps/grades/tests/integration/test_events.py
index 868b55eeae67..881ad049b3d8 100644
--- a/lms/djangoapps/grades/tests/integration/test_events.py
+++ b/lms/djangoapps/grades/tests/integration/test_events.py
@@ -70,9 +70,9 @@ def setUp(self):
         self.addCleanup(set_current_request, None)
         self.request = get_mock_request(UserFactory())
         self.student = self.request.user
-        self.client.login(username=self.student.username, password="test")
+        self.client.login(username=self.student.username, password=self.TEST_PASSWORD)
         CourseEnrollment.enroll(self.student, self.course.id)
-        self.instructor = UserFactory.create(is_staff=True, username='test_instructor', password='test')
+        self.instructor = UserFactory.create(is_staff=True, username='test_instructor', password=self.TEST_PASSWORD)
         self.refresh_course()
 
     @patch('lms.djangoapps.grades.events.tracker')
diff --git a/lms/djangoapps/grades/tests/integration/test_problems.py b/lms/djangoapps/grades/tests/integration/test_problems.py
index 36c54bec86e9..b4a2d06c9f45 100644
--- a/lms/djangoapps/grades/tests/integration/test_problems.py
+++ b/lms/djangoapps/grades/tests/integration/test_problems.py
@@ -43,9 +43,8 @@ def setUpClass(cls):
 
     def setUp(self):
         super().setUp()
-        password = 'test'
-        self.student = UserFactory.create(is_staff=False, username='test_student', password=password)
-        self.client.login(username=self.student.username, password=password)
+        self.student = UserFactory.create(is_staff=False, username='test_student', password=self.TEST_PASSWORD)
+        self.client.login(username=self.student.username, password=self.TEST_PASSWORD)
         self.addCleanup(set_current_request, None)
         self.request = get_mock_request(self.student)
         self.course_structure = get_course_blocks(self.student, self.course.location)
@@ -58,8 +57,7 @@ def load_scoreable_course(cls):
         For details on the contents and structure of the file, see
         `common/test/data/scoreable/README`.
         """
-        password = 'test'
-        user = UserFactory.create(is_staff=False, username='test_student', password=password)
+        user = UserFactory.create(is_staff=False, username='test_student', password=cls.TEST_PASSWORD)
 
         course_items = import_course_from_xml(
             cls.store,
@@ -144,7 +142,7 @@ def setUp(self):
         '''
         self.addCleanup(set_current_request, None)
         self.request = get_mock_request(UserFactory())
-        self.client.login(username=self.request.user.username, password="test")
+        self.client.login(username=self.request.user.username, password=self.TEST_PASSWORD)
         CourseEnrollment.enroll(self.request.user, self.course.id)
 
     def _get_altered_metadata(self, alterations):
diff --git a/lms/djangoapps/instructor/permissions.py b/lms/djangoapps/instructor/permissions.py
index 20426761e66b..119ecf4e35c3 100644
--- a/lms/djangoapps/instructor/permissions.py
+++ b/lms/djangoapps/instructor/permissions.py
@@ -29,6 +29,8 @@
 RESCORE_EXAMS = 'instructor.rescore_exams'
 VIEW_REGISTRATION = 'instructor.view_registration'
 VIEW_DASHBOARD = 'instructor.dashboard'
+VIEW_ENROLLMENTS = 'instructor.view_enrollments'
+VIEW_FORUM_MEMBERS = 'instructor.view_forum_members'
 
 
 perms[ALLOW_STUDENT_TO_BYPASS_ENTRANCE_EXAM] = HasAccessRule('staff')
@@ -60,3 +62,5 @@
         'instructor',
         'data_researcher'
 ) | HasAccessRule('staff') | HasAccessRule('instructor')
+perms[VIEW_ENROLLMENTS] = HasAccessRule('staff')
+perms[VIEW_FORUM_MEMBERS] = HasAccessRule('staff')
diff --git a/lms/djangoapps/instructor/tests/test_api.py b/lms/djangoapps/instructor/tests/test_api.py
index 468bca31f780..bb534d9b026a 100644
--- a/lms/djangoapps/instructor/tests/test_api.py
+++ b/lms/djangoapps/instructor/tests/test_api.py
@@ -325,7 +325,7 @@ def setUp(self):
         """
         super().setUp()
         global_user = GlobalStaffFactory()
-        self.client.login(username=global_user.username, password='test')
+        self.client.login(username=global_user.username, password=self.TEST_PASSWORD)
 
     @ddt.data(*INSTRUCTOR_POST_ENDPOINTS)
     def test_endpoints_reject_get(self, data):
@@ -478,7 +478,7 @@ def test_student_level(self):
         """
         Ensure that an enrolled student can't access staff or instructor endpoints.
         """
-        self.client.login(username=self.user.username, password='test')
+        self.client.login(username=self.user.username, password=self.TEST_PASSWORD)
 
         for endpoint, args in self.staff_level_endpoints:
             self._access_endpoint(
@@ -518,7 +518,7 @@ def test_staff_level(self):
         CourseEnrollment.enroll(staff_member, self.course.id)
         CourseFinanceAdminRole(self.course.id).add_users(staff_member)
         CourseDataResearcherRole(self.course.id).add_users(staff_member)
-        self.client.login(username=staff_member.username, password='test')
+        self.client.login(username=staff_member.username, password=self.TEST_PASSWORD)
         # Try to promote to forums admin - not working
         # update_forum_role(self.course.id, staff_member, FORUM_ROLE_ADMINISTRATOR, 'allow')
 
@@ -558,7 +558,7 @@ def test_instructor_level(self):
 
         CourseFinanceAdminRole(self.course.id).add_users(inst)
         CourseDataResearcherRole(self.course.id).add_users(inst)
-        self.client.login(username=inst.username, password='test')
+        self.client.login(username=inst.username, password=self.TEST_PASSWORD)
 
         for endpoint, args in self.staff_level_endpoints:
             expected_status = 200
@@ -632,7 +632,7 @@ def setUp(self):
         self.audit_course_instructor = InstructorFactory(course_key=self.audit_course.id)
         self.white_label_course_instructor = InstructorFactory(course_key=self.white_label_course.id)
 
-        self.client.login(username=self.instructor.username, password='test')
+        self.client.login(username=self.instructor.username, password=self.TEST_PASSWORD)
 
         self.not_enrolled_student = UserFactory(
             username='NotEnrolledStudent',
@@ -945,7 +945,7 @@ def test_audit_enrollment_mode(self):
         Test that enrollment mode for audit courses (paid courses) is 'audit'.
         """
         # Login Audit Course instructor
-        self.client.login(username=self.audit_course_instructor.username, password='test')
+        self.client.login(username=self.audit_course_instructor.username, password=self.TEST_PASSWORD)
 
         csv_content = b"test_student_wl@example.com,test_student_wl,Test Student,USA"
         uploaded_file = SimpleUploadedFile("temp.csv", csv_content)
@@ -976,7 +976,7 @@ def test_honor_enrollment_mode(self):
         self.white_label_course_mode.save()
 
         # Login Audit Course instructor
-        self.client.login(username=self.white_label_course_instructor.username, password='test')
+        self.client.login(username=self.white_label_course_instructor.username, password=self.TEST_PASSWORD)
 
         csv_content = b"test_student_wl@example.com,test_student_wl,Test Student,USA"
         uploaded_file = SimpleUploadedFile("temp.csv", csv_content)
@@ -1024,7 +1024,7 @@ def setUp(self):
 
         self.request = RequestFactory().request()
         self.instructor = InstructorFactory(course_key=self.course.id)
-        self.client.login(username=self.instructor.username, password='test')
+        self.client.login(username=self.instructor.username, password=self.TEST_PASSWORD)
 
         self.enrolled_student = UserFactory(username='EnrolledStudent', first_name='Enrolled', last_name='Student')
         CourseEnrollment.enroll(
@@ -1873,7 +1873,7 @@ def setUp(self):
         super().setUp()
 
         self.instructor = InstructorFactory(course_key=self.course.id)
-        self.client.login(username=self.instructor.username, password='test')
+        self.client.login(username=self.instructor.username, password=self.TEST_PASSWORD)
 
         self.beta_tester = BetaTesterFactory(course_key=self.course.id)
         CourseEnrollment.enroll(
@@ -2218,7 +2218,7 @@ def setUp(self):
         super().setUp()
 
         self.instructor = InstructorFactory(course_key=self.course.id)
-        self.client.login(username=self.instructor.username, password='test')
+        self.client.login(username=self.instructor.username, password=self.TEST_PASSWORD)
 
         self.other_instructor = InstructorFactory(course_key=self.course.id)
         self.other_staff = StaffFactory(course_key=self.course.id)
@@ -2458,7 +2458,7 @@ def setUp(self):
         self.course_mode.save()
         self.instructor = InstructorFactory(course_key=self.course.id)
         CourseDataResearcherRole(self.course.id).add_users(self.instructor)
-        self.client.login(username=self.instructor.username, password='test')
+        self.client.login(username=self.instructor.username, password=self.TEST_PASSWORD)
 
         self.students = [UserFactory() for _ in range(6)]
         for student in self.students:
@@ -2600,7 +2600,7 @@ def test_get_students_features_teams(self, has_teams):
             }))
             course_instructor = InstructorFactory(course_key=self.course.id)
             CourseDataResearcherRole(self.course.id).add_users(course_instructor)
-            self.client.login(username=course_instructor.username, password='test')
+            self.client.login(username=course_instructor.username, password=self.TEST_PASSWORD)
 
         url = reverse('get_students_features', kwargs={'course_id': str(self.course.id)})
 
@@ -2972,7 +2972,7 @@ def setUpClass(cls):
     def setUp(self):
         super().setUp()
         self.instructor = InstructorFactory(course_key=self.course.id)
-        self.client.login(username=self.instructor.username, password='test')
+        self.client.login(username=self.instructor.username, password=self.TEST_PASSWORD)
 
         self.student = UserFactory()
         CourseEnrollment.enroll(self.student, self.course.id)
@@ -3158,7 +3158,7 @@ def setUp(self):
         self.instructor = InstructorFactory(course_key=self.course.id)
         # Add instructor to invalid ee course
         CourseInstructorRole(self.course_with_invalid_ee.id).add_users(self.instructor)
-        self.client.login(username=self.instructor.username, password='test')
+        self.client.login(username=self.instructor.username, password=self.TEST_PASSWORD)
 
         self.student = UserFactory()
         CourseEnrollment.enroll(self.student, self.course.id)
@@ -3261,7 +3261,7 @@ def test_entrance_exam_delete_state_with_staff(self):
         """ Test entrance exam delete state failure with staff access. """
         self.client.logout()
         staff_user = StaffFactory(course_key=self.course.id)
-        self.client.login(username=staff_user.username, password='test')
+        self.client.login(username=staff_user.username, password=self.TEST_PASSWORD)
         url = reverse('reset_student_attempts_for_entrance_exam',
                       kwargs={'course_id': str(self.course.id)})
         response = self.client.post(url, {
@@ -3414,7 +3414,7 @@ def setUp(self):
         }
 
         self.instructor = InstructorFactory(course_key=self.course.id)
-        self.client.login(username=self.instructor.username, password='test')
+        self.client.login(username=self.instructor.username, password=self.TEST_PASSWORD)
 
     def tearDown(self):
         super().tearDown()
@@ -3434,7 +3434,7 @@ def test_send_email_but_not_logged_in(self):
     def test_send_email_but_not_staff(self):
         self.client.logout()
         student = UserFactory()
-        self.client.login(username=student.username, password='test')
+        self.client.login(username=student.username, password=self.TEST_PASSWORD)
         url = reverse('send_email', kwargs={'course_id': str(self.course.id)})
         response = self.client.post(url, self.full_test_message)
         assert response.status_code == 403
@@ -3631,7 +3631,7 @@ def setUpClass(cls):
     def setUp(self):
         super().setUp()
         self.instructor = InstructorFactory(course_key=self.course.id)
-        self.client.login(username=self.instructor.username, password='test')
+        self.client.login(username=self.instructor.username, password=self.TEST_PASSWORD)
 
         self.student = UserFactory()
         CourseEnrollment.enroll(self.student, self.course.id)
@@ -3768,7 +3768,7 @@ def setUp(self):
         super().setUp()
 
         self.instructor = InstructorFactory(course_key=self.course.id)
-        self.client.login(username=self.instructor.username, password='test')
+        self.client.login(username=self.instructor.username, password=self.TEST_PASSWORD)
         self.tasks = {}
         self.emails = {}
         self.emails_info = {}
@@ -4030,7 +4030,7 @@ def setUp(self):
         CourseEnrollmentFactory.create(user=self.user1, course_id=self.course.id)
         CourseEnrollmentFactory.create(user=self.user2, course_id=self.course.id)
         self.instructor = InstructorFactory(course_key=self.course.id)
-        self.client.login(username=self.instructor.username, password='test')
+        self.client.login(username=self.instructor.username, password=self.TEST_PASSWORD)
         extract_dates(None, self.course.id)
 
     def test_change_due_date(self):
@@ -4206,7 +4206,7 @@ def setUp(self):
         CourseEnrollmentFactory.create(user=self.user1, course_id=self.course.id)
         CourseEnrollmentFactory.create(user=self.user2, course_id=self.course.id)
         self.instructor = InstructorFactory(course_key=self.course.id)
-        self.client.login(username=self.instructor.username, password='test')
+        self.client.login(username=self.instructor.username, password=self.TEST_PASSWORD)
         extract_dates(None, self.course.id)
 
     @override_waffle_flag(RELATIVE_DATES_FLAG, active=True)
@@ -4251,7 +4251,7 @@ def setUpClass(cls):
     def setUp(self):
         super().setUp()
         self.instructor = InstructorFactory(course_key=self.course.id)
-        self.client.login(username=self.instructor.username, password='test')
+        self.client.login(username=self.instructor.username, password=self.TEST_PASSWORD)
 
     def generate_certificate(self, course_id, mode, status):
         """
@@ -4379,7 +4379,7 @@ def expect_error_on_file_content(self, file_content, error, file_suffix='.csv'):
         """
         Verify that we get the error we expect for a given file input.
         """
-        self.client.login(username=self.staff_user.username, password='test')
+        self.client.login(username=self.staff_user.username, password=self.TEST_PASSWORD)
         response = self.call_add_users_to_cohorts(file_content, suffix=file_suffix)
         assert response.status_code == 400
         result = json.loads(response.content.decode('utf-8'))
@@ -4392,7 +4392,7 @@ def verify_success_on_file_content(self, file_content, mock_store_upload, mock_c
         background task.
         """
         mock_store_upload.return_value = (None, 'fake_file_name.csv')
-        self.client.login(username=self.staff_user.username, password='test')
+        self.client.login(username=self.staff_user.username, password=self.TEST_PASSWORD)
         response = self.call_add_users_to_cohorts(file_content)
         assert response.status_code == 204
         assert mock_store_upload.called
@@ -4438,7 +4438,7 @@ def test_non_staff_no_access(self):
         """
         Verify that we can't access the view when we aren't a staff user.
         """
-        self.client.login(username=self.non_staff_user.username, password='test')
+        self.client.login(username=self.non_staff_user.username, password=self.TEST_PASSWORD)
         response = self.call_add_users_to_cohorts('')
         assert response.status_code == 403
 
diff --git a/lms/djangoapps/instructor/tests/test_api_email_localization.py b/lms/djangoapps/instructor/tests/test_api_email_localization.py
index e0cef6a7af0b..a23b94ece021 100644
--- a/lms/djangoapps/instructor/tests/test_api_email_localization.py
+++ b/lms/djangoapps/instructor/tests/test_api_email_localization.py
@@ -35,7 +35,7 @@ def setUp(self):
         # Esperanto.
         self.instructor = InstructorFactory(course_key=self.course.id)
         set_user_preference(self.instructor, LANGUAGE_KEY, 'zh-cn')
-        self.client.login(username=self.instructor.username, password='test')
+        self.client.login(username=self.instructor.username, password=self.TEST_PASSWORD)
 
         self.student = UserFactory.create()
         set_user_preference(self.student, LANGUAGE_KEY, 'eo')
diff --git a/lms/djangoapps/instructor/tests/test_certificates.py b/lms/djangoapps/instructor/tests/test_certificates.py
index 5350d1d07f71..11fd82bfb302 100644
--- a/lms/djangoapps/instructor/tests/test_certificates.py
+++ b/lms/djangoapps/instructor/tests/test_certificates.py
@@ -64,11 +64,11 @@ def setUp(self):
 
     def test_visible_only_to_global_staff(self):
         # Instructors don't see the certificates section
-        self.client.login(username=self.instructor.username, password="test")
+        self.client.login(username=self.instructor.username, password=self.TEST_PASSWORD)
         self._assert_certificates_visible(False)
 
         # Global staff can see the certificates section
-        self.client.login(username=self.global_staff.username, password="test")
+        self.client.login(username=self.global_staff.username, password=self.TEST_PASSWORD)
         self._assert_certificates_visible(True)
 
     def test_visible_only_when_feature_flag_enabled(self):
@@ -77,17 +77,17 @@ def test_visible_only_when_feature_flag_enabled(self):
         cache.clear()
 
         # Now even global staff can't see the certificates section
-        self.client.login(username=self.global_staff.username, password="test")
+        self.client.login(username=self.global_staff.username, password=self.TEST_PASSWORD)
         self._assert_certificates_visible(False)
 
     @ddt.data("started", "error", "success")
     def test_show_certificate_status(self, status):
-        self.client.login(username=self.global_staff.username, password="test")
+        self.client.login(username=self.global_staff.username, password=self.TEST_PASSWORD)
         with self._certificate_status("honor", status):
             self._assert_certificate_status("honor", status)
 
     def test_show_enabled_button(self):
-        self.client.login(username=self.global_staff.username, password="test")
+        self.client.login(username=self.global_staff.username, password=self.TEST_PASSWORD)
 
         # Initially, no example certs are generated, so
         # the enable button should be disabled
@@ -104,7 +104,7 @@ def test_show_enabled_button(self):
             self._assert_enable_certs_button(False)
 
     def test_can_disable_even_after_failure(self):
-        self.client.login(username=self.global_staff.username, password="test")
+        self.client.login(username=self.global_staff.username, password=self.TEST_PASSWORD)
 
         with self._certificate_status("honor", "error"):
             # When certs are disabled for a course, then don't allow them
@@ -127,7 +127,7 @@ def test_show_enabled_button_for_html_certs(self):
         self.course.cert_html_view_enabled = True
         self.course.save()
         self.store.update_item(self.course, self.global_staff.id)
-        self.client.login(username=self.global_staff.username, password="test")
+        self.client.login(username=self.global_staff.username, password=self.TEST_PASSWORD)
         response = self.client.get(self.url)
         self.assertContains(response, 'Enable Student-Generated Certificates')
         self.assertContains(response, 'enable-certificates-submit')
@@ -143,7 +143,7 @@ def test_buttons_for_html_certs_in_self_paced_course(self):
         self.course.cert_html_view_enabled = True
         self.course.save()
         self.store.update_item(self.course, self.global_staff.id)
-        self.client.login(username=self.global_staff.username, password="test")
+        self.client.login(username=self.global_staff.username, password=self.TEST_PASSWORD)
         response = self.client.get(self.url)
         self.assertContains(response, 'Enable Student-Generated Certificates')
         self.assertContains(response, 'enable-certificates-submit')
@@ -233,18 +233,18 @@ def test_allow_only_global_staff(self, url_name):
         url = reverse(url_name, kwargs={'course_id': self.course.id})
 
         # Instructors do not have access
-        self.client.login(username=self.instructor.username, password='test')
+        self.client.login(username=self.instructor.username, password=self.TEST_PASSWORD)
         response = self.client.post(url)
         assert response.status_code == 403
 
         # Global staff have access
-        self.client.login(username=self.global_staff.username, password='test')
+        self.client.login(username=self.global_staff.username, password=self.TEST_PASSWORD)
         response = self.client.post(url)
         assert response.status_code == 302
 
     @ddt.data(True, False)
     def test_enable_certificate_generation(self, is_enabled):
-        self.client.login(username=self.global_staff.username, password='test')
+        self.client.login(username=self.global_staff.username, password=self.TEST_PASSWORD)
         url = reverse(
             'enable_certificate_generation',
             kwargs={'course_id': str(self.course.id)}
@@ -274,7 +274,7 @@ def test_certificate_generation_api_without_global_staff(self):
         user who made the request is not member of global staff.
         """
         user = UserFactory.create()
-        self.client.login(username=user.username, password='test')
+        self.client.login(username=user.username, password=self.TEST_PASSWORD)
         url = reverse(
             'start_certificate_generation',
             kwargs={'course_id': str(self.course.id)}
@@ -283,7 +283,7 @@ def test_certificate_generation_api_without_global_staff(self):
         response = self.client.post(url)
         assert response.status_code == 403
 
-        self.client.login(username=self.instructor.username, password='test')
+        self.client.login(username=self.instructor.username, password=self.TEST_PASSWORD)
         response = self.client.post(url)
         assert response.status_code == 403
 
@@ -292,7 +292,7 @@ def test_certificate_generation_api_with_global_staff(self):
         Test certificates generation api endpoint returns success status when called with
         valid course key
         """
-        self.client.login(username=self.global_staff.username, password='test')
+        self.client.login(username=self.global_staff.username, password=self.TEST_PASSWORD)
         url = reverse(
             'start_certificate_generation',
             kwargs={'course_id': str(self.course.id)}
@@ -319,7 +319,7 @@ def test_certificate_regeneration_success(self):
         )
 
         # Login the client and access the url with 'certificate_statuses'
-        self.client.login(username=self.global_staff.username, password='test')
+        self.client.login(username=self.global_staff.username, password=self.TEST_PASSWORD)
         url = reverse('start_certificate_regeneration', kwargs={'course_id': str(self.course.id)})
         response = self.client.post(url, data={'certificate_statuses': [CertificateStatuses.downloadable]})
 
@@ -352,7 +352,7 @@ def test_certificate_regeneration_error(self):
         )
 
         # Login the client and access the url without 'certificate_statuses'
-        self.client.login(username=self.global_staff.username, password='test')
+        self.client.login(username=self.global_staff.username, password=self.TEST_PASSWORD)
         url = reverse('start_certificate_regeneration', kwargs={'course_id': str(self.course.id)})
         response = self.client.post(url)
 
@@ -419,7 +419,7 @@ def setUp(self):
         # Enable certificate generation
         cache.clear()
         CertificateGenerationConfiguration.objects.create(enabled=True)
-        self.client.login(username=self.global_staff.username, password='test')
+        self.client.login(username=self.global_staff.username, password=self.TEST_PASSWORD)
 
     def test_certificate_exception_added_successfully(self):
         """
@@ -712,7 +712,7 @@ def setUp(self):
         # Enable certificate generation
         cache.clear()
         CertificateGenerationConfiguration.objects.create(enabled=True)
-        self.client.login(username=self.global_staff.username, password='test')
+        self.client.login(username=self.global_staff.username, password=self.TEST_PASSWORD)
 
     def test_generate_certificate_exceptions_all_students(self):
         """
@@ -830,7 +830,7 @@ def setUp(self):
         CourseEnrollment.enroll(self.enrolled_user_2, self.course.id)
 
         # Global staff can see the certificates section
-        self.client.login(username=self.global_staff.username, password="test")
+        self.client.login(username=self.global_staff.username, password=self.TEST_PASSWORD)
 
     def test_create_allowlist_exception_record(self):
         """
@@ -1026,7 +1026,7 @@ def setUp(self):
         )
 
         # Global staff can see the certificates section
-        self.client.login(username=self.global_staff.username, password="test")
+        self.client.login(username=self.global_staff.username, password=self.TEST_PASSWORD)
 
     def test_invalidate_certificate(self):
         """
diff --git a/lms/djangoapps/instructor/tests/test_email.py b/lms/djangoapps/instructor/tests/test_email.py
index a84c728c30e9..322c734fa613 100644
--- a/lms/djangoapps/instructor/tests/test_email.py
+++ b/lms/djangoapps/instructor/tests/test_email.py
@@ -40,7 +40,7 @@ def setUp(self):
 
         # Create instructor account
         instructor = AdminFactory.create()
-        self.client.login(username=instructor.username, password="test")
+        self.client.login(username=instructor.username, password=self.TEST_PASSWORD)
 
     def tearDown(self):
         super().tearDown()
@@ -148,7 +148,7 @@ def setUp(self):
 
         # Create instructor account
         instructor = AdminFactory.create()
-        self.client.login(username=instructor.username, password="test")
+        self.client.login(username=instructor.username, password=self.TEST_PASSWORD)
 
         # URL for instructor dash
         self.url = reverse('instructor_dashboard', kwargs={'course_id': str(self.course_key)})
diff --git a/lms/djangoapps/instructor/tests/test_filters.py b/lms/djangoapps/instructor/tests/test_filters.py
index 19948da1449f..a676ab92a59c 100644
--- a/lms/djangoapps/instructor/tests/test_filters.py
+++ b/lms/djangoapps/instructor/tests/test_filters.py
@@ -99,7 +99,7 @@ def setUp(self):  # pylint: disable=arguments-differ
         """
         super().setUp()
         self.instructor = AdminFactory.create()
-        self.client.login(username=self.instructor.username, password="test")
+        self.client.login(username=self.instructor.username, password=self.TEST_PASSWORD)
         self.course = CourseFactory.create(
             org="test1", course="course1", display_name="run1",
         )
diff --git a/lms/djangoapps/instructor/tests/test_proctoring.py b/lms/djangoapps/instructor/tests/test_proctoring.py
index 491a2ee1f7ed..4b196f307b99 100644
--- a/lms/djangoapps/instructor/tests/test_proctoring.py
+++ b/lms/djangoapps/instructor/tests/test_proctoring.py
@@ -36,7 +36,7 @@ def setUp(self):
 
         # Create instructor account
         self.instructor = AdminFactory.create()
-        self.client.login(username=self.instructor.username, password="test")
+        self.client.login(username=self.instructor.username, password=self.TEST_PASSWORD)
 
     def setup_course_url(self, course):
         """
diff --git a/lms/djangoapps/instructor/tests/test_spoc_gradebook.py b/lms/djangoapps/instructor/tests/test_spoc_gradebook.py
index bf574e8f506f..221ed3603e27 100644
--- a/lms/djangoapps/instructor/tests/test_spoc_gradebook.py
+++ b/lms/djangoapps/instructor/tests/test_spoc_gradebook.py
@@ -56,7 +56,7 @@ def setUp(self):
         super().setUp()
 
         instructor = AdminFactory.create()
-        self.client.login(username=instructor.username, password='test')
+        self.client.login(username=instructor.username, password=self.TEST_PASSWORD)
         self.users = [UserFactory.create() for _ in range(USER_COUNT)]
         for user in self.users:
             CourseEnrollmentFactory.create(user=user, course_id=self.course.id)
diff --git a/lms/djangoapps/instructor/tests/views/test_instructor_dashboard.py b/lms/djangoapps/instructor/tests/views/test_instructor_dashboard.py
index bca16977a98c..400e9b556283 100644
--- a/lms/djangoapps/instructor/tests/views/test_instructor_dashboard.py
+++ b/lms/djangoapps/instructor/tests/views/test_instructor_dashboard.py
@@ -26,6 +26,7 @@
 from common.djangoapps.student.tests.factories import UserFactory
 from common.test.utils import XssTestMixin
 from lms.djangoapps.courseware.courses import get_studio_url
+from lms.djangoapps.courseware.masquerade import CourseMasquerade
 from lms.djangoapps.courseware.tabs import get_course_tab_list
 from lms.djangoapps.courseware.tests.factories import StudentModuleFactory
 from lms.djangoapps.courseware.tests.helpers import LoginEnrollmentTestCase
@@ -85,7 +86,7 @@ def setUp(self):
         self.course_mode.save()
         # Create instructor account
         self.instructor = AdminFactory.create()
-        self.client.login(username=self.instructor.username, password="test")
+        self.client.login(username=self.instructor.username, password=self.TEST_PASSWORD)
 
         # URL for instructor dash
         self.url = reverse('instructor_dashboard', kwargs={'course_id': str(self.course.id)})
@@ -119,6 +120,11 @@ def has_instructor_tab(user, course):
         staff = StaffFactory(course_key=self.course.id)
         assert has_instructor_tab(staff, self.course)
 
+        masquerade_staff = StaffFactory(course_key=self.course.id)
+        masquerade = CourseMasquerade(self.course.id, role='student')
+        masquerade_staff.masquerade_settings = {self.course.id: masquerade}
+        assert not has_instructor_tab(masquerade_staff, self.course)
+
         student = UserFactory.create()
         assert not has_instructor_tab(student, self.course)
 
@@ -169,7 +175,7 @@ def test_discussion_tab_for_course_staff_role(self, access_role, is_pages_and_re
                     org=self.course.id.org
                 )
                 set_course_cohorted(self.course.id, True)
-                self.client.login(username=self.user.username, password='test')
+                self.client.login(username=self.user.username, password=self.TEST_PASSWORD)
                 response = self.client.get(self.url).content.decode('utf-8')
                 self.assertEqual(discussion_section in response, is_discussion_tab_available)
 
@@ -192,7 +198,7 @@ def test_discussion_tab_for_global_user(self, is_pages_and_resources_enabled,
             with override_waffle_flag(OVERRIDE_DISCUSSION_LEGACY_SETTINGS_FLAG, is_legacy_discussion_setting_enabled):
                 user = UserFactory.create(is_staff=True)
                 set_course_cohorted(self.course.id, True)
-                self.client.login(username=user.username, password='test')
+                self.client.login(username=user.username, password=self.TEST_PASSWORD)
                 response = self.client.get(self.url).content.decode('utf-8')
                 self.assertEqual(discussion_section in response, is_discussion_tab_available)
 
@@ -224,7 +230,7 @@ def test_data_download(self, access_role, can_access, waffle_status):
                 role=access_role,
                 org=self.course.id.org
             )
-            self.client.login(username=user.username, password="test")
+            self.client.login(username=user.username, password=self.TEST_PASSWORD)
             response = self.client.get(self.url)
             if can_access:
                 self.assertContains(response, download_section)
@@ -244,7 +250,7 @@ def test_data_download_only(self):
             role='data_researcher',
             org=self.course.id.org
         )
-        self.client.login(username=user.username, password="test")
+        self.client.login(username=user.username, password=self.TEST_PASSWORD)
         response = self.client.get(self.url)
         matches = re.findall(
             rb'<li class="nav-item"><button type="button" class="btn-link .*" data-section=".*">.*',
@@ -320,7 +326,7 @@ def test_student_admin_staff_instructor(self):
 
         # But staff user can only see specific grades
         staff = StaffFactory(course_key=self.course.id)
-        self.client.login(username=staff.username, password="test")
+        self.client.login(username=staff.username, password=self.TEST_PASSWORD)
         response = self.client.get(self.url)
         self.assertNotContains(response, '<h4 class="hd hd-4">Adjust all enrolled learners')
         self.assertContains(response, '<h4 class="hd hd-4">View a specific learner&#39;s grades and progress')
@@ -620,7 +626,7 @@ def setUp(self):
         self.course_mode.save()
         # Create instructor account
         self.instructor = AdminFactory.create()
-        self.client.login(username=self.instructor.username, password="test")
+        self.client.login(username=self.instructor.username, password=self.TEST_PASSWORD)
 
     def test_spoc_gradebook_mongo_calls(self):
         """
diff --git a/lms/djangoapps/instructor/views/api.py b/lms/djangoapps/instructor/views/api.py
index 778cbe5c8b3e..fd346d242fcc 100644
--- a/lms/djangoapps/instructor/views/api.py
+++ b/lms/djangoapps/instructor/views/api.py
@@ -1661,7 +1661,7 @@ def get_anon_ids(request, course_id):
 @require_POST
 @ensure_csrf_cookie
 @cache_control(no_cache=True, no_store=True, must_revalidate=True)
-@require_course_permission(permissions.CAN_ENROLL)
+@require_course_permission(permissions.VIEW_ENROLLMENTS)
 @require_post_params(
     unique_student_identifier="email or username of student for whom to get enrollment status"
 )
@@ -2611,7 +2611,7 @@ def problem_grade_report(request, course_id):
 @require_POST
 @ensure_csrf_cookie
 @cache_control(no_cache=True, no_store=True, must_revalidate=True)
-@require_course_permission(permissions.CAN_ENROLL)
+@require_course_permission(permissions.VIEW_FORUM_MEMBERS)
 @require_post_params('rolename')
 def list_forum_members(request, course_id):
     """
diff --git a/lms/djangoapps/instructor/views/instructor_dashboard.py b/lms/djangoapps/instructor/views/instructor_dashboard.py
index 6e886e0c3c1c..4a06495ac9ed 100644
--- a/lms/djangoapps/instructor/views/instructor_dashboard.py
+++ b/lms/djangoapps/instructor/views/instructor_dashboard.py
@@ -47,6 +47,7 @@
 from lms.djangoapps.courseware.access import has_access
 from lms.djangoapps.courseware.courses import get_studio_url
 from lms.djangoapps.courseware.block_render import get_block_by_usage_id
+from lms.djangoapps.courseware.masquerade import get_masquerade_role
 from lms.djangoapps.discussion.django_comment_client.utils import has_forum_access
 from lms.djangoapps.grades.api import is_writable_gradebook_enabled
 from lms.djangoapps.instructor.constants import INSTRUCTOR_DASHBOARD_PLUGIN_VIEW_NAME
@@ -84,7 +85,9 @@ def is_enabled(cls, course, user=None):
         """
         Returns true if the specified user has staff access.
         """
-        return bool(user and user.is_authenticated and user.has_perm(permissions.VIEW_DASHBOARD, course.id))
+        return bool(user and user.is_authenticated and
+                    get_masquerade_role(user, course.id) != 'student' and
+                    user.has_perm(permissions.VIEW_DASHBOARD, course.id))
 
 
 def show_analytics_dashboard_message(course_key):
diff --git a/lms/djangoapps/instructor_task/rest_api/v1/tests/test_views.py b/lms/djangoapps/instructor_task/rest_api/v1/tests/test_views.py
index fb7f2a1ad2dc..bb338f0bf480 100644
--- a/lms/djangoapps/instructor_task/rest_api/v1/tests/test_views.py
+++ b/lms/djangoapps/instructor_task/rest_api/v1/tests/test_views.py
@@ -128,7 +128,7 @@ def test_list_tasks_basic_permissions(self, username, expected_status):
         Test case that verifies the permissions of the ListScheduledBulkEmailInstructorTasks view. A user without staff,
         instructor, or GlobalStaff access should not be able to retrieve the bulk email schedules for a course.
         """
-        self.client.login(username=username, password="test")
+        self.client.login(username=username, password=self.TEST_PASSWORD)
         response = self.client.get(self._build_api_url(self.course1.id))
         assert response.status_code == expected_status
 
@@ -143,7 +143,7 @@ def test_list_tasks(self):
         # add a "In Progress" task which shouldn't be returned in our results
         self._create_scheduled_course_emails_for_course(self.course1.id, self.instructor_course1, PROGRESS, 1)
 
-        self.client.login(username=self.instructor_course1.username, password="test")
+        self.client.login(username=self.instructor_course1.username, password=self.TEST_PASSWORD)
         response = self.client.get(self._build_api_url(self.course1.id))
         results = response.data.get("results")
 
@@ -169,7 +169,7 @@ def test_delete_schedules(self):
         expected_task_output_msg = "Task revoked before running"
 
         self._create_scheduled_course_emails_for_course(self.course1.id, self.instructor_course1, SCHEDULED, 3)
-        self.client.login(username=self.instructor_course1.username, password="test")
+        self.client.login(username=self.instructor_course1.username, password=self.TEST_PASSWORD)
         response = self.client.get(self._build_api_url(self.course1.id))
         results = response.data.get("results")
 
@@ -199,7 +199,7 @@ def test_delete_schedules_schedule_does_not_exist(self):
 
         This test verifies the response received when we try to delete a task schedule that does not exist.
         """
-        self.client.login(username=self.instructor_course1.username, password="test")
+        self.client.login(username=self.instructor_course1.username, password=self.TEST_PASSWORD)
         response = self.client.delete(f"{self._build_api_url(self.course1.id)}123456789")
         assert response.status_code == 404
 
@@ -214,7 +214,7 @@ def test_delete_schedule_task_already_processed(self):
         task = InstructorTask.objects.get(course_id=self.course1.id)
         schedule = InstructorTaskSchedule.objects.get(task=task)
 
-        self.client.login(username=self.instructor_course1.username, password="test")
+        self.client.login(username=self.instructor_course1.username, password=self.TEST_PASSWORD)
         response = self.client.delete(f"{self._build_api_url(self.course1.id)}{schedule.id}")
         assert response.status_code == 400
 
@@ -232,7 +232,7 @@ def test_update_schedule_new_date(self):
             "schedule": schedule_datetime.strftime('%Y-%m-%dT%H:%M:%SZ'),
             "browser_timezone": "UTC"
         }
-        self.client.login(username=self.instructor_course1.username, password="test")
+        self.client.login(username=self.instructor_course1.username, password=self.TEST_PASSWORD)
         response = self.client.patch(
             f"{self._build_api_url(self.course1.id)}{task_schedule.id}",
             data=json.dumps(data),
@@ -262,7 +262,7 @@ def test_update_schedule_edit_email(self):
             }
         }
 
-        self.client.login(username=self.instructor_course1.username, password="test")
+        self.client.login(username=self.instructor_course1.username, password=self.TEST_PASSWORD)
         response = self.client.patch(
             f"{self._build_api_url(self.course1.id)}{task_schedule.id}",
             data=json.dumps(data),
@@ -296,7 +296,7 @@ def test_update_schedule_bad_date(self):
             f"Cannot update instructor task schedule '{task_schedule.id}', the updated schedule occurs in the past"
         )
 
-        self.client.login(username=self.instructor_course1.username, password="test")
+        self.client.login(username=self.instructor_course1.username, password=self.TEST_PASSWORD)
         response = self.client.patch(
             f"{self._build_api_url(self.course1.id)}{task_schedule.id}",
             data=json.dumps(data),
@@ -328,7 +328,7 @@ def test_update_schedule_bad_email_target_data(self):
             f"Subject{email_id}'"
         )
 
-        self.client.login(username=self.instructor_course1.username, password="test")
+        self.client.login(username=self.instructor_course1.username, password=self.TEST_PASSWORD)
         response = self.client.patch(
             f"{self._build_api_url(self.course1.id)}{task_schedule.id}",
             data=json.dumps(data),
@@ -359,7 +359,7 @@ def test_update_schedule_mismatched_email_id(self):
             "specified in the request does not match the email id associated with the task"
         )
 
-        self.client.login(username=self.instructor_course1.username, password="test")
+        self.client.login(username=self.instructor_course1.username, password=self.TEST_PASSWORD)
         response = self.client.patch(
             f"{self._build_api_url(self.course1.id)}{task_schedule.id}",
             data=json.dumps(data),
@@ -379,7 +379,7 @@ def test_update_schedule_dne(self):
             "browser_timezone": "UTC"
         }
 
-        self.client.login(username=self.instructor_course1.username, password="test")
+        self.client.login(username=self.instructor_course1.username, password=self.TEST_PASSWORD)
         response = self.client.patch(
             f"{self._build_api_url(self.course1.id)}8675309",
             data=json.dumps(data),
diff --git a/lms/djangoapps/instructor_task/tests/test_base.py b/lms/djangoapps/instructor_task/tests/test_base.py
index dbcac033f740..35f9867cdc4e 100644
--- a/lms/djangoapps/instructor_task/tests/test_base.py
+++ b/lms/djangoapps/instructor_task/tests/test_base.py
@@ -161,7 +161,7 @@ def login_username(self, username):
         if self.current_user != username:
             self.logout()
             user_email = User.objects.get(username=username).email
-            self.login(user_email, "test")
+            self.login(user_email, self.TEST_PASSWORD)
             self.current_user = username
 
     def _create_user(self, username, email=None, is_staff=False, mode='honor', enrollment_active=True):
diff --git a/lms/djangoapps/learner_dashboard/api/v0/tests/test_views.py b/lms/djangoapps/learner_dashboard/api/v0/tests/test_views.py
index 0587ad7c4fe3..48479920a4a2 100644
--- a/lms/djangoapps/learner_dashboard/api/v0/tests/test_views.py
+++ b/lms/djangoapps/learner_dashboard/api/v0/tests/test_views.py
@@ -50,7 +50,6 @@
 class TestProgramProgressDetailView(ProgramsApiConfigMixin, SharedModuleStoreTestCase):
     """Unit tests for the program progress detail page."""
     program_uuid = str(uuid4())
-    password = 'test'
     url = reverse_lazy('learner_dashboard:v0:program_progress_detail', kwargs={'program_uuid': program_uuid})
 
     @classmethod
@@ -71,7 +70,7 @@ def setUp(self):
         super().setUp()
 
         self.user = UserFactory()
-        self.client.login(username=self.user.username, password=self.password)
+        self.client.login(username=self.user.username, password=self.TEST_PASSWORD)
 
     def assert_program_data_present(self, response):
         """Verify that program data is present."""
@@ -144,7 +143,6 @@ class TestProgramsView(SharedModuleStoreTestCase, ProgramCacheMixin):
 
     enterprise_uuid = str(uuid4())
     program_uuid = str(uuid4())
-    password = 'test'
     url = reverse_lazy('learner_dashboard:v0:program_list', kwargs={'enterprise_uuid': enterprise_uuid})
 
     @classmethod
@@ -184,7 +182,7 @@ def setUpClass(cls):
 
     def setUp(self):
         super().setUp()
-        self.client.login(username=self.user.username, password=self.password)
+        self.client.login(username=self.user.username, password=self.TEST_PASSWORD)
         self.set_program_in_catalog_cache(self.program_uuid, self.program)
         ProgramEnrollmentFactory.create(
             user=self.user,
diff --git a/lms/djangoapps/learner_dashboard/tests/test_programs.py b/lms/djangoapps/learner_dashboard/tests/test_programs.py
index 6b2b1604515d..c1b699c44afa 100644
--- a/lms/djangoapps/learner_dashboard/tests/test_programs.py
+++ b/lms/djangoapps/learner_dashboard/tests/test_programs.py
@@ -55,7 +55,6 @@ def load_serialized_data(response, key):
 class TestProgramListing(ProgramsApiConfigMixin, SharedModuleStoreTestCase):
     """Unit tests for the program listing page."""
     maxDiff = None
-    password = 'test'
     url = reverse_lazy('program_listing_view')
 
     @classmethod
@@ -75,7 +74,7 @@ def setUp(self):
         super().setUp()
 
         self.user = UserFactory()
-        self.client.login(username=self.user.username, password=self.password)
+        self.client.login(username=self.user.username, password=self.TEST_PASSWORD)
 
     @classmethod
     def program_sort_key(cls, program):
@@ -112,7 +111,7 @@ def test_login_required(self, mock_get_programs):
             '{}?next={}'.format(reverse('signin_user'), self.url)
         )
 
-        self.client.login(username=self.user.username, password=self.password)
+        self.client.login(username=self.user.username, password=self.TEST_PASSWORD)
 
         response = self.client.get(self.url)
         assert response.status_code == 200
@@ -224,7 +223,7 @@ def setUp(self):
         super().setUp()
 
         self.user = UserFactory()
-        self.client.login(username=self.user.username, password=self.password)
+        self.client.login(username=self.user.username, password=self.TEST_PASSWORD)
 
     def assert_program_data_present(self, response):
         """Verify that program data is present."""
@@ -277,7 +276,7 @@ def test_login_required(self, mock_get_programs, mock_get_pathways):
             '{}?next={}'.format(reverse('signin_user'), self.url)
         )
 
-        self.client.login(username=self.user.username, password=self.password)
+        self.client.login(username=self.user.username, password=self.TEST_PASSWORD)
 
         with mock.patch('lms.djangoapps.learner_dashboard.programs.get_certificates') as certs:
             certs.return_value = [{'type': 'program', 'url': '/'}]
@@ -324,7 +323,7 @@ def setUpClass(cls):
     def setUp(self):
         super().setUp()
         self.user = UserFactory()
-        self.client.login(username=self.user.username, password=self.password)
+        self.client.login(username=self.user.username, password=self.TEST_PASSWORD)
         self.set_program_in_catalog_cache(self.program_uuid, self.program)
         self.create_programs_config()
 
diff --git a/lms/djangoapps/learner_dashboard/tests/test_views.py b/lms/djangoapps/learner_dashboard/tests/test_views.py
index d38b2876f514..03f7da1d8c6d 100644
--- a/lms/djangoapps/learner_dashboard/tests/test_views.py
+++ b/lms/djangoapps/learner_dashboard/tests/test_views.py
@@ -26,7 +26,6 @@
 class TestProgramDiscussionIframeView(SharedModuleStoreTestCase, ProgramCacheMixin):
     """Unit tests for the program details page."""
     program_uuid = str(uuid4())
-    password = 'test'
     url = reverse_lazy('program_discussion', kwargs={'program_uuid': program_uuid})
 
     @classmethod
@@ -41,7 +40,7 @@ def setUpClass(cls):
     def setUp(self):
         super().setUp()
         self.user = UserFactory()
-        self.client.login(username=self.user.username, password=self.password)
+        self.client.login(username=self.user.username, password=self.TEST_PASSWORD)
         self.set_program_in_catalog_cache(self.program_uuid, self.program)
         ProgramEnrollmentFactory.create(
             user=self.user,
@@ -103,7 +102,7 @@ def test_api_returns_discussions_iframe(self, staff):
         """
         if staff:
             self.user = UserFactory(is_staff=True)
-            self.client.login(username=self.user.username, password=self.password)
+            self.client.login(username=self.user.username, password=self.TEST_PASSWORD)
         discussion_config = ProgramDiscussionsConfiguration.objects.create(
             program_uuid=self.program_uuid,
             enabled=True,
@@ -126,7 +125,7 @@ def test_program_without_enrollment(self):
         Test if API returns default response in case a non staff user has no enrollment in the program
         """
         self.user = UserFactory()
-        self.client.login(username=self.user.username, password=self.password)
+        self.client.login(username=self.user.username, password=self.TEST_PASSWORD)
         response = self.client.get(self.url)
         default_response = {
             'tab_view_enabled': False,
diff --git a/lms/djangoapps/learner_recommendations/tests/test_views.py b/lms/djangoapps/learner_recommendations/tests/test_views.py
index 87c9e905ea07..46c54dc90db1 100644
--- a/lms/djangoapps/learner_recommendations/tests/test_views.py
+++ b/lms/djangoapps/learner_recommendations/tests/test_views.py
@@ -26,8 +26,9 @@ class TestRecommendationsBase(APITestCase):
 
     def setUp(self):
         super().setUp()
-        self.user = UserFactory()
-        self.client.login(username=self.user.username, password="test")
+        self.TEST_PASSWORD = 'Password1234'
+        self.user = UserFactory(password=self.TEST_PASSWORD)
+        self.client.login(username=self.user.username, password=self.TEST_PASSWORD)
         self.recommended_courses = [
             "MITx+6.00.1x",
             "IBM+PY0101EN",
@@ -163,7 +164,7 @@ class TestRecommendationsContextView(APITestCase):
     def setUp(self):
         super().setUp()
         self.user = UserFactory()
-        self.password = "test"
+        self.password = 'Password1234'
         self.url = reverse_lazy("learner_recommendations:recommendations_context")
 
     @mock.patch("lms.djangoapps.learner_recommendations.views.country_code_from_ip")
@@ -369,8 +370,9 @@ class TestProductRecommendationsView(APITestCase):
 
     def setUp(self):
         super().setUp()
-        self.user = UserFactory()
-        self.client.login(username=self.user.username, password="test")
+        self.TEST_PASSWORD = 'Password1234'
+        self.user = UserFactory(password=self.TEST_PASSWORD)
+        self.client.login(username=self.user.username, password=self.TEST_PASSWORD)
         self.associated_course_keys = ["edx+HL1", "edx+HL2"]
         self.amplitude_keys = [
             "edx+CS0",
diff --git a/lms/djangoapps/lti_provider/migrations/0004_require_user_account.py b/lms/djangoapps/lti_provider/migrations/0004_require_user_account.py
new file mode 100644
index 000000000000..e6238e312da0
--- /dev/null
+++ b/lms/djangoapps/lti_provider/migrations/0004_require_user_account.py
@@ -0,0 +1,26 @@
+# Generated by Django 3.2.22 on 2023-11-06 09:47
+
+from django.conf import settings
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+        ('lti_provider', '0003_auto_20161118_1040'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='lticonsumer',
+            name='require_user_account',
+            field=models.BooleanField(blank=True, default=False, help_text='When checked, the LTI content will load only for learners who have an account in this instance. This is required only for linking learner accounts with the LTI consumer. See the Open edX LTI Provider documentation for more details.'),
+        ),
+        migrations.AlterField(
+            model_name='ltiuser',
+            name='edx_user',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL),
+        ),
+    ]
diff --git a/lms/djangoapps/lti_provider/models.py b/lms/djangoapps/lti_provider/models.py
index 0cb165eeef69..94582d4bf0b4 100644
--- a/lms/djangoapps/lti_provider/models.py
+++ b/lms/djangoapps/lti_provider/models.py
@@ -14,6 +14,7 @@
 
 from django.contrib.auth.models import User  # lint-amnesty, pylint: disable=imported-auth-user
 from django.db import models
+from django.utils.translation import gettext as _
 from opaque_keys.edx.django.models import CourseKeyField, UsageKeyField
 
 from openedx.core.djangolib.fields import CharNullField
@@ -34,6 +35,11 @@ class LtiConsumer(models.Model):
     consumer_key = models.CharField(max_length=32, unique=True, db_index=True, default=short_token)
     consumer_secret = models.CharField(max_length=32, unique=True, default=short_token)
     instance_guid = CharNullField(max_length=255, blank=True, null=True, unique=True)
+    require_user_account = models.BooleanField(blank=True, default=False, help_text=_(
+        "When checked, the LTI content will load only for learners who have an account "
+        "in this instance. This is required only for linking learner accounts with "
+        "the LTI consumer. See the Open edX LTI Provider documentation for more details."
+    ))
 
     @staticmethod
     def get_or_supplement(instance_guid, consumer_key):
@@ -140,7 +146,7 @@ class LtiUser(models.Model):
     """
     lti_consumer = models.ForeignKey(LtiConsumer, on_delete=models.CASCADE)
     lti_user_id = models.CharField(max_length=255)
-    edx_user = models.OneToOneField(User, on_delete=models.CASCADE)
+    edx_user = models.ForeignKey(User, on_delete=models.CASCADE)
 
     class Meta:
         unique_together = ('lti_consumer', 'lti_user_id')
diff --git a/lms/djangoapps/lti_provider/tests/test_users.py b/lms/djangoapps/lti_provider/tests/test_users.py
index d945f6b9a65a..1d19d8995be9 100644
--- a/lms/djangoapps/lti_provider/tests/test_users.py
+++ b/lms/djangoapps/lti_provider/tests/test_users.py
@@ -7,8 +7,9 @@
 from unittest.mock import MagicMock, PropertyMock, patch
 
 import pytest
-from django.contrib.auth.models import User  # lint-amnesty, pylint: disable=imported-auth-user
+from django.contrib.auth.models import AnonymousUser, User  # lint-amnesty, pylint: disable=imported-auth-user
 from django.core.exceptions import PermissionDenied
+from django.db.utils import IntegrityError
 from django.test import TestCase
 from django.test.client import RequestFactory
 
@@ -92,15 +93,22 @@ def setUp(self):
         self.old_user = UserFactory.create()
         self.request = RequestFactory().post('/')
         self.request.user = self.old_user
+        self.auto_linking_consumer = LtiConsumer(
+            consumer_name='AutoLinkingConsumer',
+            consumer_key='AutoLinkingKey',
+            consumer_secret='AutoLinkingSecret',
+            require_user_account=True
+        )
+        self.auto_linking_consumer.save()
 
-    def create_lti_user_model(self):
+    def create_lti_user_model(self, consumer=None):
         """
         Generate and save a User and an LTI user model
         """
         edx_user = User(username=self.edx_user_id)
         edx_user.save()
         lti_user = LtiUser(
-            lti_consumer=self.lti_consumer,
+            lti_consumer=consumer or self.lti_consumer,
             lti_user_id=self.lti_user_id,
             edx_user=edx_user
         )
@@ -140,6 +148,38 @@ def test_authentication_with_wrong_user(self, create_user, switch_user):
         assert not create_user.called
         switch_user.assert_called_with(self.request, lti_user, self.lti_consumer)
 
+    def test_auto_linking_of_users_using_lis_person_contact_email_primary(self, create_user, switch_user):
+        request = RequestFactory().post("/", {"lis_person_contact_email_primary": self.old_user.email})
+        request.user = self.old_user
+
+        users.authenticate_lti_user(request, self.lti_user_id, self.lti_consumer)
+        create_user.assert_called_with(self.lti_user_id, self.lti_consumer)
+
+        users.authenticate_lti_user(request, self.lti_user_id, self.auto_linking_consumer)
+        create_user.assert_called_with(self.lti_user_id, self.auto_linking_consumer, self.old_user.email)
+
+    def test_raise_exception_trying_to_auto_link_unauthenticate_user(self, create_user, switch_user):
+        request = RequestFactory().post("/")
+        request.user = AnonymousUser()
+
+        with self.assertRaises(PermissionDenied):
+            users.authenticate_lti_user(request, self.lti_user_id, self.auto_linking_consumer)
+
+    def test_raise_exception_on_mismatched_user_and_lis_email(self, create_user, switch_user):
+        request = RequestFactory().post("/", {"lis_person_contact_email_primary": "wrong_email@example.com"})
+        request.user = self.old_user
+
+        with self.assertRaises(PermissionDenied):
+            users.authenticate_lti_user(request, self.lti_user_id, self.auto_linking_consumer)
+
+    def test_authenticate_unauthenticated_user_after_auto_linking_of_user_account(self, create_user, switch_user):
+        lti_user = self.create_lti_user_model(self.auto_linking_consumer)
+        self.request.user = AnonymousUser()
+
+        users.authenticate_lti_user(self.request, self.lti_user_id, self.auto_linking_consumer)
+        assert not create_user.called
+        switch_user.assert_called_with(self.request, lti_user, self.auto_linking_consumer)
+
 
 class CreateLtiUserTest(TestCase):
     """
@@ -154,16 +194,17 @@ def setUp(self):
             consumer_secret='TestSecret'
         )
         self.lti_consumer.save()
+        self.existing_user = UserFactory.create()
 
     def test_create_lti_user_creates_auth_user_model(self):
         users.create_lti_user('lti_user_id', self.lti_consumer)
-        assert User.objects.count() == 1
+        assert User.objects.count() == 2
 
     @patch('uuid.uuid4', return_value='random_uuid')
     @patch('lms.djangoapps.lti_provider.users.generate_random_edx_username', return_value='edx_id')
     def test_create_lti_user_creates_correct_user(self, uuid_mock, _username_mock):
         users.create_lti_user('lti_user_id', self.lti_consumer)
-        assert User.objects.count() == 1
+        assert User.objects.count() == 2
         user = User.objects.get(username='edx_id')
         assert user.email == 'edx_id@lti.example.com'
         uuid_mock.assert_called_with()
@@ -173,10 +214,34 @@ def test_unique_username_created(self, username_mock):
         User(username='edx_id').save()
         users.create_lti_user('lti_user_id', self.lti_consumer)
         assert username_mock.call_count == 2
-        assert User.objects.count() == 2
+        assert User.objects.count() == 3
         user = User.objects.get(username='new_edx_id')
         assert user.email == 'new_edx_id@lti.example.com'
 
+    def test_existing_user_is_linked(self):
+        lti_user = users.create_lti_user('lti_user_id', self.lti_consumer, self.existing_user.email)
+        assert lti_user.lti_consumer == self.lti_consumer
+        assert lti_user.edx_user == self.existing_user
+
+    def test_only_one_lti_user_edx_user_for_each_lti_consumer(self):
+        users.create_lti_user('lti_user_id', self.lti_consumer, self.existing_user.email)
+
+        with pytest.raises(IntegrityError):
+            users.create_lti_user('lti_user_id', self.lti_consumer, self.existing_user.email)
+
+    def test_create_multiple_lti_users_for_edx_user_if_lti_consumer_varies(self):
+        lti_consumer_2 = LtiConsumer(
+            consumer_name="SecondConsumer",
+            consumer_key="SecondKey",
+            consumer_secret="SecondSecret",
+        )
+        lti_consumer_2.save()
+
+        lti_user_1 = users.create_lti_user('lti_user_id', self.lti_consumer, self.existing_user.email)
+        lti_user_2 = users.create_lti_user('lti_user_id', lti_consumer_2, self.existing_user.email)
+
+        assert lti_user_1.edx_user == lti_user_2.edx_user
+
 
 class LtiBackendTest(TestCase):
     """
diff --git a/lms/djangoapps/lti_provider/tests/test_views.py b/lms/djangoapps/lti_provider/tests/test_views.py
index ebb7eda154d6..8328c669cf5a 100644
--- a/lms/djangoapps/lti_provider/tests/test_views.py
+++ b/lms/djangoapps/lti_provider/tests/test_views.py
@@ -5,6 +5,7 @@
 
 from unittest.mock import MagicMock, patch
 
+from django.contrib.auth.models import AnonymousUser
 from django.test import TestCase
 from django.test.client import RequestFactory
 from django.urls import reverse
@@ -58,7 +59,7 @@ def build_launch_request(extra_post_data=None, param_to_delete=None):
         del post_data[param_to_delete]
     request = RequestFactory().post('/', data=post_data)
     request.user = UserFactory.create()
-    request.session = {}
+    request.session = MagicMock()
     return request
 
 
@@ -82,6 +83,14 @@ def setUp(self):
         )
         self.consumer.save()
 
+        self.auto_link_consumer = models.LtiConsumer(
+            consumer_name='auto-link-consumer',
+            consumer_key='consumer_key_2',
+            consumer_secret='secret_2',
+            require_user_account=True
+        )
+        self.auto_link_consumer.save()
+
 
 class LtiLaunchTest(LtiTestMixin, TestCase):
     """
@@ -189,6 +198,36 @@ def test_lti_consumer_record_supplemented_with_guid(self, _render):
         )
         assert consumer.instance_guid == 'consumer instance guid'
 
+    @patch('lms.djangoapps.lti_provider.views.render_to_response')
+    def test_unauthenticated_user_shown_error_when_require_user_account_is_enabled(self, render_error):
+        """
+        Verify that an error page is shown instead of LTI Content for an unauthenticated user,
+        when the `require_user_account` flag is enabled for the LTI Consumer.
+        """
+        request = build_launch_request({'oauth_consumer_key': 'consumer_key_2'})
+        request.user = AnonymousUser()
+
+        views.lti_launch(request, str(COURSE_KEY), str(USAGE_KEY))
+
+        render_error.assert_called()
+        assert render_error.call_args[0][0] == "lti_provider/user-auth-error.html"
+
+    @patch('lms.djangoapps.lti_provider.views.render_to_response')
+    def test_auth_error_shown_when_lis_email_is_different_from_user_email(self, render_error):
+        """
+        When the `require_user_account` flag is enabled for the LTI Consumer, verify that
+        an error page is shown instead of LTI Content if the authenticated user's email
+        doesn't match the `lis_person_contact_email_primary` value from LTI Launch.
+        """
+        # lis email different from logged in user
+        request = build_launch_request({
+            'oauth_consumer_key': 'consumer_key_2',
+            'lis_person_contact_email_primary': 'random_email@test.com'
+        })
+
+        views.lti_launch(request, str(COURSE_KEY), str(USAGE_KEY))
+        render_error.assert_called()
+
 
 class LtiLaunchTestRender(LtiTestMixin, RenderXBlockTestMixin, ModuleStoreTestCase):
     """
diff --git a/lms/djangoapps/lti_provider/users.py b/lms/djangoapps/lti_provider/users.py
index 7c5a9c88ebaa..c2373522b960 100644
--- a/lms/djangoapps/lti_provider/users.py
+++ b/lms/djangoapps/lti_provider/users.py
@@ -28,14 +28,25 @@ def authenticate_lti_user(request, lti_user_id, lti_consumer):
     If the currently logged-in user does not match the user specified by the LTI
     launch, log out the old user and log in the LTI identity.
     """
+    lis_email = request.POST.get("lis_person_contact_email_primary")
+
     try:
         lti_user = LtiUser.objects.get(
             lti_user_id=lti_user_id,
             lti_consumer=lti_consumer
         )
-    except LtiUser.DoesNotExist:
+    except LtiUser.DoesNotExist as exc:
         # This is the first time that the user has been here. Create an account.
-        lti_user = create_lti_user(lti_user_id, lti_consumer)
+        if lti_consumer.require_user_account:
+            # Verify that the email from the LTI Launch and the logged-in user are the same
+            # before linking the LtiUser with the edx_user.
+            if request.user.is_authenticated and request.user.email == lis_email:
+                lti_user = create_lti_user(lti_user_id, lti_consumer, lis_email)
+            else:
+                # Ask the user to login before linking.
+                raise PermissionDenied() from exc
+        else:
+            lti_user = create_lti_user(lti_user_id, lti_consumer)
 
     if not (request.user.is_authenticated and
             request.user == lti_user.edx_user):
@@ -44,34 +55,36 @@ def authenticate_lti_user(request, lti_user_id, lti_consumer):
         switch_user(request, lti_user, lti_consumer)
 
 
-def create_lti_user(lti_user_id, lti_consumer):
+def create_lti_user(lti_user_id, lti_consumer, email=None):
     """
     Generate a new user on the edX platform with a random username and password,
     and associates that account with the LTI identity.
     """
-    edx_password = str(uuid.uuid4())
+    edx_user = User.objects.filter(email=email).first() if email else None
 
-    created = False
-    while not created:
-        try:
-            edx_user_id = generate_random_edx_username()
-            edx_email = f"{edx_user_id}@{settings.LTI_USER_EMAIL_DOMAIN}"
-            with transaction.atomic():
-                edx_user = User.objects.create_user(
-                    username=edx_user_id,
-                    password=edx_password,
-                    email=edx_email,
-                )
-                # A profile is required if PREVENT_CONCURRENT_LOGINS flag is set.
-                # TODO: We could populate user information from the LTI launch here,
-                # but it's not necessary for our current uses.
-                edx_user_profile = UserProfile(user=edx_user)
-                edx_user_profile.save()
-            created = True
-        except IntegrityError:
-            # The random edx_user_id wasn't unique. Since 'created' is still
-            # False, we will retry with a different random ID.
-            pass
+    if not edx_user:
+        created = False
+        edx_password = str(uuid.uuid4())
+        while not created:
+            try:
+                edx_user_id = generate_random_edx_username()
+                edx_email = f"{edx_user_id}@{settings.LTI_USER_EMAIL_DOMAIN}"
+                with transaction.atomic():
+                    edx_user = User.objects.create_user(
+                        username=edx_user_id,
+                        password=edx_password,
+                        email=edx_email,
+                    )
+                    # A profile is required if PREVENT_CONCURRENT_LOGINS flag is set.
+                    # TODO: We could populate user information from the LTI launch here,
+                    # but it's not necessary for our current uses.
+                    edx_user_profile = UserProfile(user=edx_user)
+                    edx_user_profile.save()
+                    created = True
+            except IntegrityError:
+                # The random edx_user_id wasn't unique. Since 'created' is still
+                # False, we will retry with a different random ID.
+                pass
 
     lti_user = LtiUser(
         lti_consumer=lti_consumer,
diff --git a/lms/djangoapps/lti_provider/views.py b/lms/djangoapps/lti_provider/views.py
index ea2102e41893..1106908112ed 100644
--- a/lms/djangoapps/lti_provider/views.py
+++ b/lms/djangoapps/lti_provider/views.py
@@ -6,8 +6,10 @@
 import logging
 
 from django.conf import settings
+from django.core.exceptions import PermissionDenied
 from django.http import Http404, HttpResponseBadRequest, HttpResponseForbidden
 from django.views.decorators.csrf import csrf_exempt
+from common.djangoapps.edxmako.shortcuts import render_to_response
 from opaque_keys import InvalidKeyError
 from opaque_keys.edx.keys import CourseKey, UsageKey
 
@@ -88,7 +90,17 @@ def lti_launch(request, course_id, usage_id):
 
     # Create an edX account if the user identifed by the LTI launch doesn't have
     # one already, and log the edX account into the platform.
-    authenticate_lti_user(request, params['user_id'], lti_consumer)
+    try:
+        authenticate_lti_user(request, params['user_id'], lti_consumer)
+    except PermissionDenied:
+        request.session.flush()
+        context = {
+            "login_link": request.build_absolute_uri(settings.LOGIN_URL),
+            "allow_iframing": True,
+            "disable_header": True,
+            "disable_footer": True,
+        }
+        return render_to_response("lti_provider/user-auth-error.html", context)
 
     # Store any parameters required by the outcome service in order to report
     # scores back later. We know that the consumer exists, since the record was
diff --git a/lms/djangoapps/mobile_api/testutils.py b/lms/djangoapps/mobile_api/testutils.py
index fe2804782a06..f74d4b45a5fd 100644
--- a/lms/djangoapps/mobile_api/testutils.py
+++ b/lms/djangoapps/mobile_api/testutils.py
@@ -50,7 +50,7 @@ def setUp(self):
             certificate_available_date=datetime.datetime.now(pytz.UTC)
         )
         self.user = UserFactory.create()
-        self.password = 'test'
+        self.password = self.TEST_PASSWORD
         self.username = self.user.username
         self.api_version = API_V1
         IgnoreMobileAvailableFlagConfig(enabled=False).save()
diff --git a/lms/djangoapps/staticbook/tests.py b/lms/djangoapps/staticbook/tests.py
index 81c67523f248..919ee16c4fef 100644
--- a/lms/djangoapps/staticbook/tests.py
+++ b/lms/djangoapps/staticbook/tests.py
@@ -60,7 +60,7 @@ def make_course(self, **kwargs):
         self.course = CourseFactory.create(**kwargs)
         user = UserFactory.create()
         CourseEnrollmentFactory.create(user=user, course_id=self.course.id)
-        self.client.login(username=user.username, password='test')
+        self.client.login(username=user.username, password=self.TEST_PASSWORD)
 
     def make_url(self, url_name, **kwargs):
         """
diff --git a/lms/djangoapps/survey/tests/test_models.py b/lms/djangoapps/survey/tests/test_models.py
index 0fb2b5fe7476..e8c6619da647 100644
--- a/lms/djangoapps/survey/tests/test_models.py
+++ b/lms/djangoapps/survey/tests/test_models.py
@@ -30,7 +30,7 @@ def setUp(self):
         self.client = Client()
 
         # Create two accounts
-        self.password = 'abc'
+        self.password = 'Password1234'
         self.student = UserFactory.create(
             username='student', email='student@test.com', password=self.password,
         )
diff --git a/lms/djangoapps/survey/tests/test_utils.py b/lms/djangoapps/survey/tests/test_utils.py
index f02efe09346c..ce35474d6d28 100644
--- a/lms/djangoapps/survey/tests/test_utils.py
+++ b/lms/djangoapps/survey/tests/test_utils.py
@@ -28,7 +28,7 @@ def setUp(self):
         self.client = Client()
 
         # Create two accounts
-        self.password = 'abc'
+        self.password = self.TEST_PASSWORD
         self.student = UserFactory.create(
             username='student', email='student@test.com', password=self.password,
         )
diff --git a/lms/djangoapps/survey/tests/test_views.py b/lms/djangoapps/survey/tests/test_views.py
index 1e2ff04ba9a2..07ddd34e0576 100644
--- a/lms/djangoapps/survey/tests/test_views.py
+++ b/lms/djangoapps/survey/tests/test_views.py
@@ -29,7 +29,7 @@ def setUp(self):
         self.client = Client()
 
         # Create two accounts
-        self.password = 'abc'
+        self.password = self.TEST_PASSWORD
         self.student = UserFactory.create(username='student', email='student@test.com', password=self.password)
 
         self.test_survey_name = 'TestSurvey'
diff --git a/lms/djangoapps/verify_student/tests/test_views.py b/lms/djangoapps/verify_student/tests/test_views.py
index ea2ccb891988..77ee515d3757 100644
--- a/lms/djangoapps/verify_student/tests/test_views.py
+++ b/lms/djangoapps/verify_student/tests/test_views.py
@@ -93,6 +93,8 @@ def mock_render_to_response(*args, **kwargs):
 3W+sdGFUK3GH1NAX71VxbAlFVLUetcMwai1+wXmGkRw6A7YezVFnhw==
 -----END RSA PRIVATE KEY-----"""
 
+TEST_PASSWORD = 'Password1234'
+
 
 def _mock_payment_processors():
     """
@@ -122,8 +124,8 @@ def test_start_new_verification(self):
         Test the case where the user has no pending `PhotoVerificationAttempts`,
         but is just starting their first.
         """
-        UserFactory.create(username="rusty", password="test")
-        self.client.login(username="rusty", password="test")
+        UserFactory.create(username="rusty", password=TEST_PASSWORD)
+        self.client.login(username="rusty", password=TEST_PASSWORD)
 
     def must_be_logged_in(self):
         self.assertHttpForbidden(self.client.get(self.start_url()))  # lint-amnesty, pylint: disable=no-member
@@ -1055,11 +1057,11 @@ def setUp(self):
         """ Create a user and course. """
         super().setUp()
 
-        self.user = UserFactory.create(username="test", password="test")
+        self.user = UserFactory.create(username="test", password=TEST_PASSWORD)
         self.course = CourseFactory.create()
         for mode, min_price in (('audit', 0), ('honor', 0), ('verified', 100)):
             CourseModeFactory.create(mode_slug=mode, course_id=self.course.id, min_price=min_price, sku=self.make_sku())
-        self.client.login(username="test", password="test")
+        self.client.login(username="test", password=TEST_PASSWORD)
 
     def _assert_checked_out(
         self,
@@ -1868,7 +1870,7 @@ def setUp(self):
         super().setUp()
 
         self.user = AdminFactory()
-        login_success = self.client.login(username=self.user.username, password='test')
+        login_success = self.client.login(username=self.user.username, password=TEST_PASSWORD)
         assert login_success
         self.attempt = SoftwareSecurePhotoVerification(
             status="submitted",
@@ -1895,7 +1897,7 @@ def test_photo_url_view_returns_404_if_invalid_receipt_id(self):
 
     def test_403_for_non_staff(self):
         self.user = UserFactory()
-        login_success = self.client.login(username=self.user.username, password='test')
+        login_success = self.client.login(username=self.user.username, password=TEST_PASSWORD)
         assert login_success
         url = reverse('verification_photo_urls', kwargs={'receipt_id': str(self.receipt_id)})
         response = self.client.get(url)
@@ -1934,7 +1936,7 @@ class TestDecodeImageViews(MockS3Boto3Mixin, TestVerificationBase):
     def setUp(self):
         super().setUp()
         self.user = AdminFactory()
-        login_success = self.client.login(username=self.user.username, password='test')
+        login_success = self.client.login(username=self.user.username, password=TEST_PASSWORD)
         assert login_success
 
     def _mock_submit_images(self):
@@ -1995,7 +1997,7 @@ def test_download_image_response(self, img_type, _mock_get_storage):
     @ddt.data("face", "photo_id")
     def test_403_for_non_staff(self, img_type):
         self.user = UserFactory()
-        login_success = self.client.login(username=self.user.username, password='test')
+        login_success = self.client.login(username=self.user.username, password=TEST_PASSWORD)
         assert login_success
 
         self._mock_submit_images()
diff --git a/lms/envs/bok_choy.py b/lms/envs/bok_choy.py
deleted file mode 100644
index 9a39d4d8bb72..000000000000
--- a/lms/envs/bok_choy.py
+++ /dev/null
@@ -1,154 +0,0 @@
-"""
-Settings for Bok Choy tests that are used when running LMS.
-
-Bok Choy uses two different settings files:
-1. test_static_optimized is used when invoking collectstatic
-2. bok_choy is used when running the tests
-
-Note: it isn't possible to have a single settings file, because Django doesn't
-support both generating static assets to a directory and also serving static
-from the same directory.
-"""
-
-
-# Silence noisy logs
-import logging
-import os
-from tempfile import mkdtemp
-
-from django.utils.translation import gettext_lazy
-from path import Path as path
-
-from openedx.core.release import RELEASE_LINE
-from xmodule.modulestore.modulestore_settings import update_module_store_settings  # lint-amnesty, pylint: disable=wrong-import-order
-
-CONFIG_ROOT = path(__file__).abspath().dirname()
-TEST_ROOT = CONFIG_ROOT.dirname().dirname() / "test_root"
-
-########################## Prod-like settings ###################################
-# These should be as close as possible to the settings we use in production.
-# As in prod, we read in environment and auth variables from JSON files.
-# Unlike in prod, we use the JSON files stored in this repo.
-# This is a convenience for ensuring (a) that we can consistently find the files
-# and (b) that the files are the same in Jenkins as in local dev.
-os.environ['SERVICE_VARIANT'] = 'bok_choy_docker' if 'BOK_CHOY_HOSTNAME' in os.environ else 'bok_choy'
-os.environ['LMS_CFG'] = str.format("{config_root}/{service_variant}.yml",
-                                   config_root=CONFIG_ROOT, service_variant=os.environ['SERVICE_VARIANT'])
-os.environ['REVISION_CFG'] = f"{CONFIG_ROOT}/revisions.yml"
-
-from .production import *  # pylint: disable=wildcard-import, unused-wildcard-import, wrong-import-position
-
-
-######################### Testing overrides ####################################
-
-# Redirect to the test_root folder within the repo
-GITHUB_REPO_ROOT = (TEST_ROOT / "data").abspath()
-LOG_DIR = (TEST_ROOT / "log").abspath()
-
-# Configure modulestore to use the test folder within the repo
-update_module_store_settings(
-    MODULESTORE,
-    module_store_options={
-        'fs_root': (TEST_ROOT / "data").abspath(),
-    },
-    xml_store_options={
-        'data_dir': (TEST_ROOT / "data").abspath(),
-    },
-    default_store=os.environ.get('DEFAULT_STORE', 'draft'),
-)
-
-PLATFORM_NAME = gettext_lazy("édX")
-PLATFORM_DESCRIPTION = gettext_lazy("Open édX Platform")
-
-############################ STATIC FILES #############################
-
-# Serve static files at /static directly from the staticfiles directory under test root
-# Note: optimized files for testing are generated with settings from test_static_optimized
-STATIC_URL = "/static/"
-STATICFILES_FINDERS = ['django.contrib.staticfiles.finders.FileSystemFinder']
-STATICFILES_DIRS = [
-    (TEST_ROOT / "staticfiles" / "lms").abspath(),
-]
-
-DEFAULT_FILE_STORAGE = 'django.core.files.storage.FileSystemStorage'
-MEDIA_ROOT = TEST_ROOT / "uploads"
-
-# Webpack loader must use webpack output setting
-WEBPACK_LOADER['DEFAULT']['STATS_FILE'] = TEST_ROOT / "staticfiles" / "lms" / "webpack-stats.json"
-
-# Don't use compression during tests
-PIPELINE['JS_COMPRESSOR'] = None
-
-###################### Grades ######################
-GRADES_DOWNLOAD = {
-    'STORAGE_TYPE': 'localfs',
-    'BUCKET': 'edx-grades',
-    'ROOT_PATH': os.path.join(mkdtemp(), 'edx-s3', 'grades'),
-}
-
-
-LOG_OVERRIDES = [
-    ('track.middleware', logging.CRITICAL),
-    ('common.djangoapps.edxmako.shortcuts', logging.ERROR),
-    ('edx.discussion', logging.CRITICAL),
-]
-for log_name, log_level in LOG_OVERRIDES:
-    logging.getLogger(log_name).setLevel(log_level)
-
-
-YOUTUBE_HOSTNAME = os.environ.get('BOK_CHOY_HOSTNAME', '127.0.0.1')
-# Point the URL used to test YouTube availability to our stub YouTube server
-YOUTUBE_PORT = 9080
-YOUTUBE['TEST_TIMEOUT'] = 5000
-YOUTUBE['API'] = f"http://{YOUTUBE_HOSTNAME}:{YOUTUBE_PORT}/get_youtube_api/"
-YOUTUBE['METADATA_URL'] = f"http://{YOUTUBE_HOSTNAME}:{YOUTUBE_PORT}/test_youtube/"
-
-############################# SECURITY SETTINGS ################################
-# Default to advanced security in common.py, so tests can reset here to use
-# a simpler security model
-
-# Path at which to store the mock index
-MOCK_SEARCH_BACKING_FILE = (
-    TEST_ROOT / "index_file.dat"
-).abspath()
-
-# Verify student settings
-VERIFY_STUDENT["SOFTWARE_SECURE"] = {
-    "API_ACCESS_KEY": "BBBBBBBBBBBBBBBBBBBB",
-    "API_SECRET_KEY": "CCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC",
-}
-
-# Set dummy values for profile image settings.
-PROFILE_IMAGE_BACKEND = {
-    'class': 'openedx.core.storage.OverwriteStorage',
-    'options': {
-        'location': os.path.join(MEDIA_ROOT, 'profile-images/'),
-        'base_url': os.path.join(MEDIA_URL, 'profile-images/'),
-    },
-}
-
-LMS_ROOT_URL = "http://localhost:{}".format(os.environ.get('BOK_CHOY_LMS_PORT', 8003))
-CMS_BASE = "localhost:{}".format(os.environ.get('BOK_CHOY_CMS_PORT', 8031))
-LOGIN_REDIRECT_WHITELIST = [CMS_BASE]
-
-INSTALLED_APPS.append('openedx.testing.coverage_context_listener')
-
-if RELEASE_LINE == "master":
-    # On master, acceptance tests use edX books, not the default Open edX books.
-    HELP_TOKENS_BOOKS = {
-        'learner': 'https://edx.readthedocs.io/projects/edx-guide-for-students',
-        'course_author': 'https://edx.readthedocs.io/projects/edx-partner-course-staff',
-    }
-
-# API access management
-API_ACCESS_MANAGER_EMAIL = 'api-access@example.com'
-API_ACCESS_FROM_EMAIL = 'api-requests@example.com'
-API_DOCUMENTATION_URL = 'https://course-catalog-api-guide.readthedocs.io/en/latest/'
-AUTH_DOCUMENTATION_URL = 'https://course-catalog-api-guide.readthedocs.io/en/latest/authentication/index.html'
-
-#####################################################################
-# Lastly, see if the developer has any local overrides.
-try:
-    from .private import *      # pylint: disable=wildcard-import
-except ImportError:
-    pass
diff --git a/lms/envs/bok_choy.yml b/lms/envs/bok_choy.yml
deleted file mode 100644
index 0468867eb74b..000000000000
--- a/lms/envs/bok_choy.yml
+++ /dev/null
@@ -1,274 +0,0 @@
-# ingested edx-platform/lms/envs/bok_choy.auth.json
-# ingested edx-platform/lms/envs/bok_choy.env.json
-ACTIVATION_EMAIL_SUPPORT_LINK: https://support.example.com/activation-email-help.html
-ANALYTICS_DASHBOARD_URL: ''
-AWS_ACCESS_KEY_ID: ''
-AWS_SECRET_ACCESS_KEY: ''
-BUGS_EMAIL: bugs@example.com
-BULK_EMAIL_DEFAULT_FROM_EMAIL: no-reply@example.com
-BADGING_BACKEND: 'lms.djangoapps.badges.backends.tests.dummy_backend.DummyBackend'
-BLOCK_STRUCTURES_SETTINGS:
-  # We have CELERY_ALWAYS_EAGER set to True, so there's no asynchronous
-  # code running and the celery routing is unimportant.
-  # It does not make sense to retry.
-  TASK_MAX_RETRIES: 0
-  # course publish task delay is irrelevant is because the task is run synchronously
-  COURSE_PUBLISH_TASK_DELAY: 0
-  # retry delay is irrelevent because we never retry
-  TASK_DEFAULT_RETRY_DELAY: 0
-
-CACHES:
-  celery:
-    BACKEND: django.core.cache.backends.memcached.PyMemcacheCache
-    OPTIONS:
-      no_delay: true
-      ignore_exc: true
-      use_pooling: true
-    KEY_FUNCTION: common.djangoapps.util.memcache.safe_key
-    KEY_PREFIX: integration_celery
-    LOCATION: ['localhost:11211']
-  default:
-    BACKEND: django.core.cache.backends.memcached.PyMemcacheCache
-    OPTIONS:
-      no_delay: true
-      ignore_exc: true
-      use_pooling: true
-    KEY_FUNCTION: common.djangoapps.util.memcache.safe_key
-    KEY_PREFIX: sandbox_default
-    LOCATION: ['localhost:11211']
-  general:
-    BACKEND: django.core.cache.backends.memcached.PyMemcacheCache
-    OPTIONS:
-      no_delay: true
-      ignore_exc: true
-      use_pooling: true
-    KEY_FUNCTION: common.djangoapps.util.memcache.safe_key
-    KEY_PREFIX: sandbox_general
-    LOCATION: ['localhost:11211']
-  mongo_metadata_inheritance:
-    BACKEND: django.core.cache.backends.memcached.PyMemcacheCache
-    OPTIONS:
-      no_delay: true
-      ignore_exc: true
-      use_pooling: true
-    KEY_FUNCTION: common.djangoapps.util.memcache.safe_key
-    KEY_PREFIX: integration_mongo_metadata_inheritance
-    LOCATION: ['localhost:11211']
-  staticfiles:
-    BACKEND: django.core.cache.backends.memcached.PyMemcacheCache
-    OPTIONS:
-      no_delay: true
-      ignore_exc: true
-      use_pooling: true
-    KEY_FUNCTION: common.djangoapps.util.memcache.safe_key
-    KEY_PREFIX: integration_static_files
-    LOCATION: ['localhost:11211']
-
-# Capture the console log via template includes, until webdriver supports log capture again
-CAPTURE_CONSOLE_LOG: True
-
-CELERY_BROKER_HOSTNAME: localhost
-CELERY_BROKER_PASSWORD: celery
-CELERY_BROKER_TRANSPORT: amqp
-CELERY_BROKER_USER: celery
-CELERY_ALWAYS_EAGER: True
-CELERY_RESULT_BACKEND: 'django-cache'
-CLEAR_REQUEST_CACHE_ON_TASK_COMPLETION: False
-
-CERT_QUEUE: certificates
-CMS_BASE: localhost:8031
-CODE_JAIL:
-  limits: {REALTIME: 3, VMEM: 0}
-COMMENTS_SERVICE_KEY: password
-COMMENTS_SERVICE_URL: http://localhost:4567
-COMPLETION_BY_VIEWING_DELAY_MS: 1000
-CONTACT_EMAIL: info@example.com
-CONTENTSTORE:
-  DOC_STORE_CONFIG:
-    collection: modulestore
-    db: test
-    host: [localhost]
-    port: 27017
-  ENGINE: xmodule.contentstore.mongo.MongoContentStore
-  OPTIONS:
-    db: test
-    host: [localhost]
-    port: 27017
-DATABASES:
-  default: {ENGINE: django.db.backends.mysql, HOST: localhost, NAME: edxtest, PASSWORD: '',
-    PORT: '3306', USER: root}
-  student_module_history: {ENGINE: django.db.backends.mysql, HOST: localhost, NAME: student_module_history_test,
-    PASSWORD: '', PORT: '3306', USER: root}
-DEFAULT_FEEDBACK_EMAIL: feedback@example.com
-DEFAULT_FROM_EMAIL: registration@example.com
-
-# Enable debug so that static assets are served by Django
-DEBUG: True
-DJFS: {aws_access_key_id: test, aws_secret_access_key: test, bucket: test, prefix: test,
-  type: s3fs}
-DOC_STORE_CONFIG:
-  collection: modulestore
-  db: test
-  host: [localhost]
-  port: 27017
-# Configure the LMS to use our stub eCommerce implementation
-ECOMMERCE_API_URL: 'http://localhost:8043/api/v2/'
-# Configure the LMS to use our stub EdxNotes implementation
-EDXNOTES_PUBLIC_API: 'http://localhost:8042/api/v1'
-EDXNOTES_INTERNAL_API: 'http://localhost:8042/api/v1'
-
-EDXNOTES_CONNECT_TIMEOUT: 10  # time in seconds
-EDXNOTES_READ_TIMEOUT: 10  # time in seconds
-
-NOTES_DISABLED_TABS: []
-
-EMAIL_BACKEND: django.core.mail.backends.dummy.EmailBackend
-EVENT_TRACKING_BACKENDS:
-  mongo:
-    ENGINE: eventtracking.backends.mongodb.MongoBackend
-    OPTIONS: {collection: events, database: test}
-FEATURES:
-  ALLOW_AUTOMATED_SIGNUPS: true
-  AUTOMATIC_AUTH_FOR_TESTING: true
-  AUTOMATIC_VERIFY_STUDENT_IDENTITY_FOR_TESTING: true
-  CERTIFICATES_HTML_VIEW: true
-  CERTIFICATES_INSTRUCTOR_GENERATION: true
-  CUSTOM_COURSES_EDX: true,
-  ENABLE_COURSE_DISCOVERY: true
-  ENABLE_DISCUSSION_SERVICE: true
-  ENABLE_GRADE_DOWNLOADS: true
-  ENABLE_SPECIAL_EXAMS: true
-  ENABLE_THIRD_PARTY_AUTH: true
-  ENABLE_VERIFIED_CERTIFICATES: true
-  EXPOSE_CACHE_PROGRAMS_ENDPOINT: true
-  MODE_CREATION_FOR_TESTING: true
-  PREVIEW_LMS_BASE: 'preview.localhost:8003'
-  RESTRICT_AUTOMATIC_AUTH: false
-  SHOW_HEADER_LANGUAGE_SELECTOR: true
-  ENABLE_MAX_FAILED_LOGIN_ATTEMPTS: False
-  SQUELCH_PII_IN_LOGS: False
-  PREVENT_CONCURRENT_LOGINS: False
-  ENABLE_MOBILE_REST_API: True  # Show video bumper in LMS
-  ENABLE_VIDEO_BUMPER: True  # Show video bumper in LMS
-  SHOW_BUMPER_PERIODICITY: 1
-  # Enable courseware search for tests
-  ENABLE_COURSEWARE_SEARCH: True
-  # Enable dashboard search for tests
-  ENABLE_DASHBOARD_SEARCH: True
-  # discussion home panel, which includes a subscription on/off setting for discussion digest emails.
-  ENABLE_DISCUSSION_HOME_PANEL: True
-  # Enable support for OpenBadges accomplishments
-  ENABLE_OPENBADGES: True
-  ENABLE_LTI_PROVIDER: True
-  # Enable milestones app
-  MILESTONES_APP: True
-  # Enable oauth authentication, which we test.
-  ENABLE_OAUTH2_PROVIDER: True
-  OAUTH_ENFORCE_SECURE: False
-  ENABLE_PREREQUISITE_COURSES: True
-  ENABLE_COURSE_DISCOVERY: True
-  ENABLE_EDXNOTES: True
-  ENABLE_TEAMS: True
-  LICENSING: True
-  # Use the auto_auth workflow for creating users and logging them in
-  AUTOMATIC_AUTH_FOR_TESTING: True
-  RESTRICT_AUTOMATIC_AUTH: False
-  # Open up endpoint for faking Software Secure responses
-  ENABLE_SOFTWARE_SECURE_FAKE: True
-  # Disable instructor dash buttons for downloading course data when enrollment exceeds this number
-  MAX_ENROLLMENT_INSTR_BUTTONS: 4
-  ENABLE_ENROLLMENT_TRACK_USER_PARTITION: True
-  ENTRANCE_EXAMS: True
-  ENABLE_SPECIAL_EXAMS: True
-
-
-GITHUB_REPO_ROOT: '** OVERRIDDEN **'
-JWT_AUTH: {JWT_PRIVATE_SIGNING_JWK: '{"e": "AQAB", "d": "HIiV7KNjcdhVbpn3KT-I9n3JPf5YbGXsCIedmPqDH1d4QhBofuAqZ9zebQuxkRUpmqtYMv0Zi6ECSUqH387GYQF_XvFUFcjQRPycISd8TH0DAKaDpGr-AYNshnKiEtQpINhcP44I1AYNPCwyoxXA1fGTtmkKChsuWea7o8kytwU5xSejvh5-jiqu2SF4GEl0BEXIAPZsgbzoPIWNxgO4_RzNnWs6nJZeszcaDD0CyezVSuH9QcI6g5QFzAC_YuykSsaaFJhZ05DocBsLczShJ9Omf6PnK9xlm26I84xrEh_7x4fVmNBg3xWTLh8qOnHqGko93A1diLRCrKHOvnpvgQ",
-    "n": "o5cn3ljSRi6FaDEKTn0PS-oL9EFyv1pI7dRgffQLD1qf5D6sprmYfWWokSsrWig8u2y0HChSygR6Jn5KXBqQn6FpM0dDJLnWQDRXHLl3Ey1iPYgDSmOIsIGrV9ZyNCQwk03wAgWbfdBTig3QSDYD-sTNOs3pc4UD_PqAvU2nz_1SS2ZiOwOn5F6gulE1L0iE3KEUEvOIagfHNVhz0oxa_VRZILkzV-zr6R_TW1m97h4H8jXl_VJyQGyhMGGypuDrQ9_vaY_RLEulLCyY0INglHWQ7pckxBtI5q55-Vio2wgewe2_qYcGsnBGaDNbySAsvYcWRrqDiFyzrJYivodqTQ",
-    "q": "3T3DEtBUka7hLGdIsDlC96Uadx_q_E4Vb1cxx_4Ss_wGp1Loz3N3ZngGyInsKlmbBgLo1Ykd6T9TRvRNEWEtFSOcm2INIBoVoXk7W5RuPa8Cgq2tjQj9ziGQ08JMejrPlj3Q1wmALJr5VTfvSYBu0WkljhKNCy1KB6fCby0C9WE",
-    "p": "vUqzWPZnDG4IXyo-k5F0bHV0BNL_pVhQoLW7eyFHnw74IOEfSbdsMspNcPSFIrtgPsn7981qv3lN_staZ6JflKfHayjB_lvltHyZxfl0dvruShZOx1N6ykEo7YrAskC_qxUyrIvqmJ64zPW3jkuOYrFs7Ykj3zFx3Zq1H5568G0",
-    "kid": "BTZ9HA6K", "kty": "RSA"}', JWT_PUBLIC_SIGNING_JWK_SET: '{"keys": [{"kid":
-    "BTZ9HA6K", "e": "AQAB", "kty": "RSA", "n": "o5cn3ljSRi6FaDEKTn0PS-oL9EFyv1pI7dRgffQLD1qf5D6sprmYfWWokSsrWig8u2y0HChSygR6Jn5KXBqQn6FpM0dDJLnWQDRXHLl3Ey1iPYgDSmOIsIGrV9ZyNCQwk03wAgWbfdBTig3QSDYD-sTNOs3pc4UD_PqAvU2nz_1SS2ZiOwOn5F6gulE1L0iE3KEUEvOIagfHNVhz0oxa_VRZILkzV-zr6R_TW1m97h4H8jXl_VJyQGyhMGGypuDrQ9_vaY_RLEulLCyY0INglHWQ7pckxBtI5q55-Vio2wgewe2_qYcGsnBGaDNbySAsvYcWRrqDiFyzrJYivodqTQ"}]}',
-  JWT_SECRET_KEY: super-secret-key}
-LMS_BASE: localhost:8003
-LMS_ROOT_URL: http://localhost:8003
-LOCAL_LOGLEVEL: INFO
-LOGGING_ENV: sandbox
-LOG_DIR: '** OVERRIDDEN **'
-MEDIA_URL: /media/
-MKTG_URL_LINK_MAP: {ABOUT: about, BLOG: blog, CAREERS: careers, CONTACT: contact,
-  COURSES: courses, DONATE: donate, HELP_CENTER: help-center, HONOR: honor, NEWS: news,
-  PRESS: press, PRIVACY: privacy, ROOT: root, SITEMAP.XML: sitemap_xml, TOS: tos,
-  WHAT_IS_VERIFIED_CERT: verified-certificate}
-MODULESTORE:
-  default:
-    ENGINE: xmodule.modulestore.mixed.MixedModuleStore
-    OPTIONS:
-      mappings: {}
-      stores:
-      - DOC_STORE_CONFIG:
-          collection: modulestore
-          db: test
-          host: [localhost]
-          port: 27017
-        ENGINE: xmodule.modulestore.mongo.DraftMongoModuleStore
-        NAME: draft
-        OPTIONS:
-          collection: modulestore
-          db: test
-          default_class: xmodule.hidden_block.HiddenBlock
-          fs_root: '** OVERRIDDEN **'
-          host: [localhost]
-          port: 27017
-          render_template: common.djangoapps.edxmako.shortcuts.render_to_string
-      - ENGINE: xmodule.modulestore.xml.XMLModuleStore
-        NAME: xml
-        OPTIONS: {data_dir: '** OVERRIDDEN **', default_class: xmodule.hidden_block.HiddenBlock}
-# We need to test different scenarios, following setting effectively disbale rate limiting
-PASSWORD_RESET_IP_RATE: '1/s'
-PASSWORD_RESET_EMAIL_RATE: '1/s'
-PASSWORD_RESET_SUPPORT_LINK: https://support.example.com/password-reset-help.html
-REGISTRATION_EXTENSION_FORM: openedx.core.djangoapps.user_api.tests.test_helpers.TestCaseForm
-REGISTRATION_EXTRA_FIELDS: {city: hidden, country: required, gender: optional, goals: optional,
-  honor_code: required, level_of_education: optional, mailing_address: optional, terms_of_service: hidden,
-  year_of_birth: optional}
-# Use MockSearchEngine as the search engine for test scenario
-SEARCH_ENGINE: "search.tests.mock_search_engine.MockSearchEngine"
-# this secret key should be the same as cms/envs/bok_choy.py's
-SECRET_KEY: "very_secret_bok_choy_key"
-
-SERVER_EMAIL: devops@example.com
-SESSION_COOKIE_DOMAIN: null
-SITE_NAME: localhost:8003
-SOCIAL_SHARING_SETTINGS: {CERTIFICATE_FACEBOOK: true, CERTIFICATE_FACEBOOK_TEXT: 'Testing
-    facebook feature:', CUSTOM_COURSE_URLS: true, DASHBOARD_FACEBOOK: true, DASHBOARD_TWITTER: true,
-  DASHBOARD_TWITTER_TEXT: 'Testing feature:'}
-STATIC_URL_BASE: /static/
-SUPPORT_SITE_LINK: https://support.example.com
-SYSLOG_SERVER: ''
-TECH_SUPPORT_EMAIL: technical@example.com
-THIRD_PARTY_AUTH_BACKENDS: [social_core.backends.google.GoogleOAuth2, social_core.backends.linkedin.LinkedinOAuth2,
-  social_core.backends.facebook.FacebookOAuth2, common.djangoapps.third_party_auth.dummy.DummyBackend,
-  common.djangoapps.third_party_auth.saml.SAMLAuthBackend]
-THIRD_PARTY_AUTH:
-  Google:
-    SOCIAL_AUTH_GOOGLE_OAUTH2_KEY": "test"
-    SOCIAL_AUTH_GOOGLE_OAUTH2_SECRET": "test"
-  Facebook:
-    SOCIAL_AUTH_FACEBOOK_KEY": "test"
-    SOCIAL_AUTH_FACEBOOK_SECRET": "test"
-TIME_ZONE: America/New_York
-TRACKING_BACKENDS:
-  mongo:
-    ENGINE: common.djangoapps.track.backends.mongodb.MongoBackend
-    OPTIONS: {collection: events, database: test}
-WIKI_ENABLED: true
-WAFFLE_OVERRIDE: True
-XQUEUE_INTERFACE:
-  basic_auth: [edx, edx]
-  django_auth: {password: password, username: lms}
-  # Configure the LMS to use our stub XQueue implementation
-  url: 'http://localhost:8040'
-
-ZENDESK_API_KEY: ''
-ZENDESK_USER: ''
diff --git a/lms/envs/bok_choy_docker.py b/lms/envs/bok_choy_docker.py
deleted file mode 100644
index 991b22e37361..000000000000
--- a/lms/envs/bok_choy_docker.py
+++ /dev/null
@@ -1,27 +0,0 @@
-"""
-Settings for Bok Choy tests that are used when running Studio in Docker-based devstack.
-"""
-
-# noinspection PyUnresolvedReferences
-from .bok_choy import *  # pylint: disable=wildcard-import
-
-CMS_BASE = '{}:{}'.format(os.environ['BOK_CHOY_HOSTNAME'], os.environ.get('BOK_CHOY_CMS_PORT', 8031))
-LMS_BASE = '{}:{}'.format(os.environ['BOK_CHOY_HOSTNAME'], os.environ.get('BOK_CHOY_LMS_PORT', 8003))
-LMS_ROOT_URL = f'http://{LMS_BASE}'
-LOGIN_REDIRECT_WHITELIST = [CMS_BASE]
-SITE_NAME = LMS_BASE
-
-COMMENTS_SERVICE_URL = 'http://{}:4567'.format(os.environ['BOK_CHOY_HOSTNAME'])
-EDXNOTES_PUBLIC_API = 'http://{}:8042/api/v1'.format(os.environ['BOK_CHOY_HOSTNAME'])
-
-# Docker does not support the syslog socket at /dev/log. Rely on the console.
-LOGGING['handlers']['local'] = LOGGING['handlers']['tracking'] = {
-    'class': 'logging.NullHandler',
-}
-
-LOGGING['loggers']['tracking']['handlers'] = ['console']
-
-# Point the URL used to test YouTube availability to our stub YouTube server
-BOK_CHOY_HOST = os.environ['BOK_CHOY_HOSTNAME']
-YOUTUBE['API'] = f"http://{BOK_CHOY_HOST}:{YOUTUBE_PORT}/get_youtube_api/"
-YOUTUBE['METADATA_URL'] = f"http://{BOK_CHOY_HOST}:{YOUTUBE_PORT}/test_youtube/"
diff --git a/lms/envs/bok_choy_docker.yml b/lms/envs/bok_choy_docker.yml
deleted file mode 100644
index f93063086a53..000000000000
--- a/lms/envs/bok_choy_docker.yml
+++ /dev/null
@@ -1,183 +0,0 @@
-# ingested edx-platform/lms/envs/bok_choy_docker.auth.json
-# ingested edx-platform/lms/envs/bok_choy_docker.env.json
-ACTIVATION_EMAIL_SUPPORT_LINK: https://support.example.com/activation-email-help.html
-ANALYTICS_DASHBOARD_URL: ''
-AWS_ACCESS_KEY_ID: ''
-AWS_SECRET_ACCESS_KEY: ''
-BUGS_EMAIL: bugs@example.com
-BULK_EMAIL_DEFAULT_FROM_EMAIL: no-reply@example.com
-CACHES:
-  celery:
-    BACKEND: django.core.cache.backends.memcached.PyMemcacheCache
-    KEY_FUNCTION: common.djangoapps.util.memcache.safe_key
-    KEY_PREFIX: integration_celery
-    LOCATION: ['edx.devstack.memcached:11211']
-    OPTIONS:
-      no_delay: true
-      ignore_exc: true
-      use_pooling: true
-  default:
-    BACKEND: django.core.cache.backends.memcached.PyMemcacheCache
-    KEY_FUNCTION: common.djangoapps.util.memcache.safe_key
-    KEY_PREFIX: sandbox_default
-    LOCATION: ['edx.devstack.memcached:11211']
-    OPTIONS:
-      no_delay: true
-      ignore_exc: true
-      use_pooling: true
-  general:
-    BACKEND: django.core.cache.backends.memcached.PyMemcacheCache
-    KEY_FUNCTION: common.djangoapps.util.memcache.safe_key
-    KEY_PREFIX: sandbox_general
-    LOCATION: ['edx.devstack.memcached:11211']
-    OPTIONS:
-      no_delay: true
-      ignore_exc: true
-      use_pooling: true
-  mongo_metadata_inheritance:
-    BACKEND: django.core.cache.backends.memcached.PyMemcacheCache
-    KEY_FUNCTION: common.djangoapps.util.memcache.safe_key
-    KEY_PREFIX: integration_mongo_metadata_inheritance
-    LOCATION: ['edx.devstack.memcached:11211']
-    OPTIONS:
-      no_delay: true
-      ignore_exc: true
-      use_pooling: true
-  staticfiles:
-    BACKEND: django.core.cache.backends.memcached.PyMemcacheCache
-    KEY_FUNCTION: common.djangoapps.util.memcache.safe_key
-    KEY_PREFIX: integration_static_files
-    LOCATION: ['edx.devstack.memcached:11211']
-    OPTIONS:
-      no_delay: true
-      ignore_exc: true
-      use_pooling: true
-CELERY_BROKER_HOSTNAME: localhost
-CELERY_BROKER_PASSWORD: celery
-CELERY_BROKER_TRANSPORT: amqp
-CELERY_BROKER_USER: celery
-CERT_QUEUE: certificates
-CMS_BASE: '** OVERRIDDEN **'
-CODE_JAIL:
-  limits: {REALTIME: 3, VMEM: 0}
-COMMENTS_SERVICE_KEY: password
-COMMENTS_SERVICE_URL: http://edx.devstack.lms:4567
-CONTACT_EMAIL: info@example.com
-CONTENTSTORE:
-  DOC_STORE_CONFIG:
-    collection: modulestore
-    db: test
-    host: [edx.devstack.mongo]
-    port: 27017
-  ENGINE: xmodule.contentstore.mongo.MongoContentStore
-  OPTIONS:
-    db: test
-    host: [edx.devstack.mongo]
-    port: 27017
-DATABASES:
-  default: {ENGINE: django.db.backends.mysql, HOST: edx.devstack.mysql80, NAME: edxtest,
-    PASSWORD: '', PORT: '3306', USER: root}
-  student_module_history: {ENGINE: django.db.backends.mysql, HOST: edx.devstack.mysql80,
-    NAME: student_module_history_test, PASSWORD: '', PORT: '3306', USER: root}
-DEFAULT_FEEDBACK_EMAIL: feedback@example.com
-DEFAULT_FROM_EMAIL: registration@example.com
-DJFS: {aws_access_key_id: test, aws_secret_access_key: test, bucket: test, prefix: test,
-  type: s3fs}
-DOC_STORE_CONFIG:
-  collection: modulestore
-  db: test
-  host: [edx.devstack.mongo]
-  port: 27017
-EMAIL_BACKEND: django.core.mail.backends.dummy.EmailBackend
-EVENT_TRACKING_BACKENDS:
-  mongo:
-    ENGINE: eventtracking.backends.mongodb.MongoBackend
-    OPTIONS:
-      collection: events
-      database: test
-      host: [edx.devstack.mongo]
-      port: 27017
-FEATURES: {ALLOW_AUTOMATED_SIGNUPS: true, AUTOMATIC_AUTH_FOR_TESTING: true,
-  AUTOMATIC_VERIFY_STUDENT_IDENTITY_FOR_TESTING: true, CERTIFICATES_HTML_VIEW: true,
-  CERTIFICATES_INSTRUCTOR_GENERATION: true, CUSTOM_COURSES_EDX: true,
-  ENABLE_COURSE_DISCOVERY: true, ENABLE_DISCUSSION_SERVICE: true, ENABLE_GRADE_DOWNLOADS: true,
-  ENABLE_SPECIAL_EXAMS: true, ENABLE_THIRD_PARTY_AUTH: true,
-  ENABLE_VERIFIED_CERTIFICATES: true, EXPOSE_CACHE_PROGRAMS_ENDPOINT: true, MODE_CREATION_FOR_TESTING: true,
-  PREVIEW_LMS_BASE: 'preview.localhost:8003', RESTRICT_AUTOMATIC_AUTH: false, SHOW_HEADER_LANGUAGE_SELECTOR: true}
-GITHUB_REPO_ROOT: '** OVERRIDDEN **'
-JWT_AUTH: {JWT_PRIVATE_SIGNING_JWK: '{"e": "AQAB", "d": "HIiV7KNjcdhVbpn3KT-I9n3JPf5YbGXsCIedmPqDH1d4QhBofuAqZ9zebQuxkRUpmqtYMv0Zi6ECSUqH387GYQF_XvFUFcjQRPycISd8TH0DAKaDpGr-AYNshnKiEtQpINhcP44I1AYNPCwyoxXA1fGTtmkKChsuWea7o8kytwU5xSejvh5-jiqu2SF4GEl0BEXIAPZsgbzoPIWNxgO4_RzNnWs6nJZeszcaDD0CyezVSuH9QcI6g5QFzAC_YuykSsaaFJhZ05DocBsLczShJ9Omf6PnK9xlm26I84xrEh_7x4fVmNBg3xWTLh8qOnHqGko93A1diLRCrKHOvnpvgQ",
-    "n": "o5cn3ljSRi6FaDEKTn0PS-oL9EFyv1pI7dRgffQLD1qf5D6sprmYfWWokSsrWig8u2y0HChSygR6Jn5KXBqQn6FpM0dDJLnWQDRXHLl3Ey1iPYgDSmOIsIGrV9ZyNCQwk03wAgWbfdBTig3QSDYD-sTNOs3pc4UD_PqAvU2nz_1SS2ZiOwOn5F6gulE1L0iE3KEUEvOIagfHNVhz0oxa_VRZILkzV-zr6R_TW1m97h4H8jXl_VJyQGyhMGGypuDrQ9_vaY_RLEulLCyY0INglHWQ7pckxBtI5q55-Vio2wgewe2_qYcGsnBGaDNbySAsvYcWRrqDiFyzrJYivodqTQ",
-    "q": "3T3DEtBUka7hLGdIsDlC96Uadx_q_E4Vb1cxx_4Ss_wGp1Loz3N3ZngGyInsKlmbBgLo1Ykd6T9TRvRNEWEtFSOcm2INIBoVoXk7W5RuPa8Cgq2tjQj9ziGQ08JMejrPlj3Q1wmALJr5VTfvSYBu0WkljhKNCy1KB6fCby0C9WE",
-    "p": "vUqzWPZnDG4IXyo-k5F0bHV0BNL_pVhQoLW7eyFHnw74IOEfSbdsMspNcPSFIrtgPsn7981qv3lN_staZ6JflKfHayjB_lvltHyZxfl0dvruShZOx1N6ykEo7YrAskC_qxUyrIvqmJ64zPW3jkuOYrFs7Ykj3zFx3Zq1H5568G0",
-    "kid": "BTZ9HA6K", "kty": "RSA"}', JWT_PUBLIC_SIGNING_JWK_SET: '{"keys": [{"kid":
-    "BTZ9HA6K", "e": "AQAB", "kty": "RSA", "n": "o5cn3ljSRi6FaDEKTn0PS-oL9EFyv1pI7dRgffQLD1qf5D6sprmYfWWokSsrWig8u2y0HChSygR6Jn5KXBqQn6FpM0dDJLnWQDRXHLl3Ey1iPYgDSmOIsIGrV9ZyNCQwk03wAgWbfdBTig3QSDYD-sTNOs3pc4UD_PqAvU2nz_1SS2ZiOwOn5F6gulE1L0iE3KEUEvOIagfHNVhz0oxa_VRZILkzV-zr6R_TW1m97h4H8jXl_VJyQGyhMGGypuDrQ9_vaY_RLEulLCyY0INglHWQ7pckxBtI5q55-Vio2wgewe2_qYcGsnBGaDNbySAsvYcWRrqDiFyzrJYivodqTQ"}]}',
-  JWT_SECRET_KEY: super-secret-key}
-LMS_BASE: http://edx.devstack.lms:18003
-LMS_ROOT_URL: http://edx.devstack.lms:18003
-LOCAL_LOGLEVEL: INFO
-LOGGING_ENV: sandbox
-LOG_DIR: '** OVERRIDDEN **'
-MEDIA_URL: /media/
-MKTG_URL_LINK_MAP: {ABOUT: about, BLOG: blog, CAREERS: careers, CONTACT: contact,
-  COURSES: courses, DONATE: donate, HELP_CENTER: help-center, HONOR: honor, NEWS: news,
-  PRESS: press, PRIVACY: privacy, ROOT: root, SITEMAP.XML: sitemap_xml, TOS: tos,
-  WHAT_IS_VERIFIED_CERT: verified-certificate}
-MODULESTORE:
-  default:
-    ENGINE: xmodule.modulestore.mixed.MixedModuleStore
-    OPTIONS:
-      mappings: {}
-      stores:
-      - DOC_STORE_CONFIG:
-          collection: modulestore
-          db: test
-          host: [edx.devstack.mongo]
-          port: 27017
-        ENGINE: xmodule.modulestore.mongo.DraftMongoModuleStore
-        NAME: draft
-        OPTIONS:
-          collection: modulestore
-          db: test
-          default_class: xmodule.hidden_block.HiddenBlock
-          fs_root: '** OVERRIDDEN **'
-          host: [edx.devstack.mongo]
-          port: 27017
-          render_template: common.djangoapps.edxmako.shortcuts.render_to_string
-      - ENGINE: xmodule.modulestore.xml.XMLModuleStore
-        NAME: xml
-        OPTIONS: {data_dir: '** OVERRIDDEN **', default_class: xmodule.hidden_block.HiddenBlock}
-PASSWORD_RESET_SUPPORT_LINK: https://support.example.com/password-reset-help.html
-REGISTRATION_EXTENSION_FORM: openedx.core.djangoapps.user_api.tests.test_helpers.TestCaseForm
-REGISTRATION_EXTRA_FIELDS: {city: hidden, country: required, gender: optional, goals: optional,
-  honor_code: required, level_of_education: optional, mailing_address: optional, terms_of_service: hidden,
-  year_of_birth: optional}
-SECRET_KEY: 'bokchoy_docker_secret_key'
-SERVER_EMAIL: devops@example.com
-SESSION_COOKIE_DOMAIN: null
-SITE_NAME: localhost:8003
-SOCIAL_SHARING_SETTINGS: {CERTIFICATE_FACEBOOK: true, CERTIFICATE_FACEBOOK_TEXT: 'Testing
-    facebook feature:', CUSTOM_COURSE_URLS: true, DASHBOARD_FACEBOOK: true, DASHBOARD_TWITTER: true,
-  DASHBOARD_TWITTER_TEXT: 'Testing feature:'}
-STATIC_URL_BASE: /static/
-SUPPORT_SITE_LINK: https://support.example.com
-SYSLOG_SERVER: ''
-TECH_SUPPORT_EMAIL: technical@example.com
-THIRD_PARTY_AUTH_BACKENDS: [social_core.backends.google.GoogleOAuth2, social_core.backends.linkedin.LinkedinOAuth2,
-  social_core.backends.facebook.FacebookOAuth2, common.djangoapps.third_party_auth.dummy.DummyBackend,
-  common.djangoapps.third_party_auth.saml.SAMLAuthBackend]
-TIME_ZONE: America/New_York
-TRACKING_BACKENDS:
-  mongo:
-    ENGINE: common.djangoapps.track.backends.mongodb.MongoBackend
-    OPTIONS:
-      collection: events
-      database: test
-      host: [edx.devstack.mongo]
-      port: 27017
-WIKI_ENABLED: true
-XQUEUE_INTERFACE:
-  basic_auth: [edx, edx]
-  django_auth: {password: password, username: lms}
-  url: '** OVERRIDDEN **'
-ZENDESK_API_KEY: ''
-ZENDESK_USER: ''
diff --git a/lms/envs/common.py b/lms/envs/common.py
index 0907b3f8a451..b4ae77d78409 100644
--- a/lms/envs/common.py
+++ b/lms/envs/common.py
@@ -696,19 +696,6 @@
     # .. toggle_tickets: https://github.com/openedx/edx-platform/pull/9744
     'ENABLE_SPECIAL_EXAMS': False,
 
-    # .. toggle_name: FEATURES['ENABLE_OPENBADGES']
-    # .. toggle_implementation: DjangoSetting
-    # .. toggle_default: False
-    # .. toggle_description: Enables support for the creation of OpenBadges as a method of awarding credentials.
-    # .. toggle_warning: The following settings (all of which are in the same file) should be set or reviewed prior to
-    #    enabling this setting: BADGING_BACKEND, BADGR_API_TOKEN, BADGR_BASE_URL, BADGR_ISSUER_SLUG, BADGR_TIMEOUT.
-    #    Full guide for setting up OpenBadges available here:
-    #    https://edx.readthedocs.io/projects/edx-installing-configuring-and-running/en/latest/configuration/enable_badging.html  pylint: disable=line-too-long,useless-suppression
-    # .. toggle_use_cases: open_edx
-    # .. toggle_creation_date: 2015-04-30
-    # .. toggle_tickets: https://openedx.atlassian.net/browse/SOL-1325
-    'ENABLE_OPENBADGES': False,
-
     # .. toggle_name: FEATURES['ENABLE_LTI_PROVIDER']
     # .. toggle_implementation: DjangoSetting
     # .. toggle_default: False
@@ -1039,6 +1026,18 @@
     # .. toggle_creation_date: 2022-06-06
     # .. toggle_tickets: 'https://github.com/edx/edx-platform/pull/29538'
     'DISABLE_ALLOWED_ENROLLMENT_IF_ENROLLMENT_CLOSED': False,
+
+    # .. toggle_name: FEATURES['SEND_LEARNING_CERTIFICATE_LIFECYCLE_EVENTS_TO_BUS']
+    # .. toggle_implementation: SettingToggle
+    # .. toggle_default: False
+    # .. toggle_description: When True, the system will publish certificate lifecycle signals to the event bus.
+    #    This toggle is used to create the EVENT_BUS_PRODUCER_CONFIG setting.
+    # .. toggle_warning: The default may be changed in a later release. See
+    #    https://github.com/openedx/openedx-events/issues/265
+    # .. toggle_use_cases: opt_in
+    # .. toggle_creation_date: 2023-10-10
+    # .. toggle_tickets: https://github.com/openedx/openedx-events/issues/210
+    'SEND_LEARNING_CERTIFICATE_LIFECYCLE_EVENTS_TO_BUS': False
 }
 
 # Specifies extra XBlock fields that should available when requested via the Course Blocks API
@@ -1128,6 +1127,7 @@
             'no_delay': True,
             'ignore_exc': True,
             'use_pooling': True,
+            'connect_timeout': 0.5
         }
     },
     'course_structure_cache': {
@@ -1140,6 +1140,7 @@
             'no_delay': True,
             'ignore_exc': True,
             'use_pooling': True,
+            'connect_timeout': 0.5
         }
     },
     'celery': {
@@ -1152,6 +1153,7 @@
             'no_delay': True,
             'ignore_exc': True,
             'use_pooling': True,
+            'connect_timeout': 0.5
         }
     },
     'mongo_metadata_inheritance': {
@@ -1164,6 +1166,7 @@
             'no_delay': True,
             'ignore_exc': True,
             'use_pooling': True,
+            'connect_timeout': 0.5
         }
     },
     'staticfiles': {
@@ -1175,6 +1178,7 @@
             'no_delay': True,
             'ignore_exc': True,
             'use_pooling': True,
+            'connect_timeout': 0.5
         }
     },
     'default': {
@@ -1187,6 +1191,7 @@
             'no_delay': True,
             'ignore_exc': True,
             'use_pooling': True,
+            'connect_timeout': 0.5
         }
     },
     'configuration': {
@@ -1198,6 +1203,7 @@
             'no_delay': True,
             'ignore_exc': True,
             'use_pooling': True,
+            'connect_timeout': 0.5
         }
     },
     'general': {
@@ -1209,6 +1215,7 @@
             'no_delay': True,
             'ignore_exc': True,
             'use_pooling': True,
+            'connect_timeout': 0.5
         }
     },
 }
@@ -1239,6 +1246,7 @@
         'certificates:read': _('Retrieve your course certificates'),
         'grades:read': _('Retrieve your grades for your enrolled courses'),
         'tpa:read': _('Retrieve your third-party authentication username mapping'),
+        # user_id is added in code as a default scope for JWT cookies and all password grant_type JWTs
         'user_id': _('Know your user identifier'),
     }),
     'DEFAULT_SCOPES': OAUTH2_DEFAULT_SCOPES,
@@ -3304,6 +3312,7 @@ def _make_locale_paths(settings):  # pylint: disable=missing-function-docstring
 
     # Notifications
     'openedx.core.djangoapps.notifications',
+    'openedx_events',
 ]
 
 ######################### CSRF #########################################
@@ -3323,7 +3332,14 @@ def _make_locale_paths(settings):  # pylint: disable=missing-function-docstring
 REST_FRAMEWORK = {
     # These default classes add observability around endpoints using defaults, and should
     # not be used anywhere else.
+    # Notes on Order:
+    # 1. `JwtAuthentication` does not check `is_active`, so email validation does not affect it. However,
+    #    `SessionAuthentication` does. These work differently, and order changes in what way, which really stinks. See
+    #    https://github.com/openedx/public-engineering/issues/165 for details.
+    # 2. `JwtAuthentication` may also update the database based on contents. Since the LMS creates these JWTs, this
+    #    shouldn't have any affect at this time. But it could, when and if another service started creating the JWTs.
     'DEFAULT_AUTHENTICATION_CLASSES': [
+        'openedx.core.djangolib.default_auth_classes.DefaultJwtAuthentication',
         'openedx.core.djangolib.default_auth_classes.DefaultSessionAuthentication',
     ],
     'DEFAULT_PAGINATION_CLASS': 'edx_rest_framework_extensions.paginators.DefaultPagination',
@@ -3653,68 +3669,6 @@ def _make_locale_paths(settings):  # pylint: disable=missing-function-docstring
 CERT_NAME_SHORT = "Certificate"
 CERT_NAME_LONG = "Certificate of Achievement"
 
-#################### OpenBadges Settings #######################
-
-# .. setting_name: BADGING_BACKEND
-# .. setting_default: 'lms.djangoapps.badges.backends.badgr.BadgrBackend'
-# .. setting_description: The backend service class (or callable) for creating OpenBadges. It must implement
-#    the interface provided by lms.djangoapps.badges.backends.base.BadgeBackend
-# .. setting_warning: Review FEATURES['ENABLE_OPENBADGES'] for further context.
-BADGING_BACKEND = 'lms.djangoapps.badges.backends.badgr.BadgrBackend'
-
-# .. setting_name: BADGR_BASE_URL
-# .. setting_default: 'http://localhost:8005'
-# .. setting_description: The base URL for the Badgr server.
-# .. setting_warning: DO NOT include a trailing slash. Review FEATURES['ENABLE_OPENBADGES'] for further context.
-BADGR_BASE_URL = "http://localhost:8005"
-
-# .. setting_name: BADGR_ISSUER_SLUG
-# .. setting_default: 'example-issuer'
-# .. setting_description: A string that is the slug for the Badgr issuer. The slug can be obtained from the URL of
-#    the Badgr Server page that displays the issuer. For example, in the URL
-#    http://exampleserver.com/issuer/test-issuer, the issuer slug is "test-issuer".
-# .. setting_warning: Review FEATURES['ENABLE_OPENBADGES'] for further context.
-BADGR_ISSUER_SLUG = "example-issuer"
-
-# .. setting_name: BADGR_USERNAME
-# .. setting_default: None
-# .. setting_description: The username for Badgr. You should set up an issuer application with Badgr
-#    (https://badgr.org/app-developers/). The username and password will then be used to create or renew
-#    OAuth2 tokens.
-# .. setting_warning: Review FEATURES['ENABLE_OPENBADGES'] for further context.
-BADGR_USERNAME = None
-
-# .. setting_name: BADGR_PASSWORD
-# .. setting_default: None
-# .. setting_description: The password for Badgr. You should set up an issuer application with Badgr
-#    (https://badgr.org/app-developers/). The username and password will then be used to create or renew
-#    OAuth2 tokens.
-# .. setting_warning: Review FEATURES['ENABLE_OPENBADGES'] for further context.
-BADGR_PASSWORD = None
-
-# .. setting_name: BADGR_TOKENS_CACHE_KEY
-# .. setting_default: None
-# .. setting_description: The cache key for Badgr API tokens. Once created, the tokens will be stored in cache.
-#    Define the key here for setting and retrieveing the tokens.
-# .. setting_warning: Review FEATURES['ENABLE_OPENBADGES'] for further context.
-BADGR_TOKENS_CACHE_KEY = None
-
-# .. setting_name: BADGR_TIMEOUT
-# .. setting_default: 10
-# .. setting_description: Number of seconds to wait on the badging server when contacting it before giving up.
-# .. setting_warning: Review FEATURES['ENABLE_OPENBADGES'] for further context.
-BADGR_TIMEOUT = 10
-
-# .. toggle_name: BADGR_ENABLE_NOTIFICATIONS
-# .. toggle_implementation: DjangoSetting
-# .. toggle_default: False
-# .. toggle_description: Optional setting for enabling email notifications. When set to "True",
-#    learners will be notified by email when they earn a badge.
-# .. toggle_use_cases: open_edx
-# .. toggle_creation_date: 2021-07-29
-# .. toggle_warning: Review FEATURES['ENABLE_OPENBADGES'] for further context.
-BADGR_ENABLE_NOTIFICATIONS = False
-
 ###################### Grade Downloads ######################
 # These keys are used for all of our asynchronous downloadable files, including
 # the ones that contain information other than grades.
@@ -3756,7 +3710,7 @@ def _make_locale_paths(settings):  # pylint: disable=missing-function-docstring
     {
         "NAME": "common.djangoapps.util.password_policy_validators.MinimumLengthValidator",
         "OPTIONS": {
-            "min_length": 2
+            "min_length": 8
         }
     },
     {
@@ -4195,9 +4149,6 @@ def _make_locale_paths(settings):  # pylint: disable=missing-function-docstring
         "level_of_education",
         'social_links',
         'time_zone',
-
-        # Not an actual field, but used to signal whether badges should be public.
-        'accomplishments_shared',
     ]
 )
 
@@ -4484,6 +4435,9 @@ def _make_locale_paths(settings):  # pylint: disable=missing-function-docstring
     r'edX/org.edx.mobile',
 ]
 
+# set course limit for mobile search
+MOBILE_SEARCH_COURSE_LIMIT = 100
+
 # cache timeout in seconds for Mobile App Version Upgrade
 APP_UPGRADE_CACHE_TIMEOUT = 3600
 
@@ -5362,6 +5316,10 @@ def _make_locale_paths(settings):  # pylint: disable=missing-function-docstring
 
 ############## PLOTLY ##############
 
+############ Internal Enterprise Settings ############
+ENTERPRISE_VSF_UUID = "e815503343644ac7845bc82325c34460"
+############ Internal Enterprise Settings ############
+
 ENTERPRISE_MANUAL_REPORTING_CUSTOMER_UUIDS = []
 
 AVAILABLE_DISCUSSION_TOURS = []
@@ -5382,10 +5340,84 @@ def _make_locale_paths(settings):  # pylint: disable=missing-function-docstring
 EXPIRED_NOTIFICATIONS_DELETE_BATCH_SIZE = 10000
 NOTIFICATION_CREATION_BATCH_SIZE = 99
 
+############################ AI_TRANSLATIONS ##################################
+AI_TRANSLATIONS_API_URL = 'http://localhost:18760/api/v1'
+
 #### django-simple-history##
 # disable indexing on date field its coming from django-simple-history.
 SIMPLE_HISTORY_DATE_INDEX = False
 
-#### Event bus publishing ####
-## Will be more filled out as part of https://github.com/edx/edx-arch-experiments/issues/381
-EVENT_BUS_PRODUCER_CONFIG = {}
+
+def _should_send_certificate_events(settings):
+    return settings.FEATURES['SEND_LEARNING_CERTIFICATE_LIFECYCLE_EVENTS_TO_BUS']
+
+#### Event bus producing ####
+# .. setting_name: EVENT_BUS_PRODUCER_CONFIG
+# .. setting_default: all events disabled
+# .. setting_description: Dictionary of event_types mapped to dictionaries of topic to topic-related configuration.
+#    Each topic configuration dictionary contains
+#    * `enabled`: a toggle denoting whether the event will be published to the topic. These should be annotated
+#       according to
+#       https://edx.readthedocs.io/projects/edx-toggles/en/latest/how_to/documenting_new_feature_toggles.html
+#    * `event_key_field` which is a period-delimited string path to event data field to use as event key.
+#    Note: The topic names should not include environment prefix as it will be dynamically added based on
+#    EVENT_BUS_TOPIC_PREFIX setting.
+EVENT_BUS_PRODUCER_CONFIG = {
+    'org.openedx.learning.certificate.created.v1': {
+        'learning-certificate-lifecycle':
+            {'event_key_field': 'certificate.course.course_key', 'enabled': _should_send_certificate_events},
+    },
+    'org.openedx.learning.certificate.revoked.v1': {
+        'learning-certificate-lifecycle':
+            {'event_key_field': 'certificate.course.course_key', 'enabled': _should_send_certificate_events},
+    },
+    'org.openedx.learning.course.unenrollment.completed.v1': {
+        'course-unenrollment-lifecycle':
+            {'event_key_field': 'enrollment.course.course_key',
+             # .. toggle_name: EVENT_BUS_PRODUCER_CONFIG['org.openedx.learning.course.unenrollment.completed.v1']
+             #    ['course-unenrollment-lifecycle']['enabled']
+             # .. toggle_implementation: DjangoSetting
+             # .. toggle_default: False
+             # .. toggle_description: Enables sending COURSE_UNENROLLMENT_COMPLETED events over the event bus.
+             # .. toggle_use_cases: opt_in
+             # .. toggle_creation_date: 2023-09-18
+             # .. toggle_warning: The default may be changed in a later release. See
+             #   https://github.com/openedx/openedx-events/issues/265
+             # .. toggle_tickets: https://github.com/openedx/openedx-events/issues/210
+             'enabled': False},
+    },
+    'org.openedx.learning.xblock.skill.verified.v1': {
+        'learning-xblock-skill-verified':
+            {'event_key_field': 'xblock_info.usage_key',
+             # .. toggle_name: EVENT_BUS_PRODUCER_CONFIG['org.openedx.learning.xblock.skill.verified.v1']
+             #    ['learning-xblock-skill-verified']['enabled']
+             # .. toggle_implementation: DjangoSetting
+             # .. toggle_default: False
+             # .. toggle_description: Enables sending xblock_skill_verified events over the event bus.
+             # .. toggle_use_cases: opt_in
+             # .. toggle_creation_date: 2023-09-18
+             # .. toggle_warning: The default may be changed in a later release. See
+             #   https://github.com/openedx/openedx-events/issues/265
+             # .. toggle_tickets: https://github.com/openedx/openedx-events/issues/210
+             'enabled': False}
+    },
+    # CMS events. These have to be copied over here because cms.common adds some derived entries as well,
+    # and the derivation fails if the keys are missing. If we ever fully decouple the lms and cms settings,
+    # we can remove these.
+    'org.openedx.content_authoring.xblock.published.v1': {
+        'course-authoring-xblock-lifecycle':
+            {'event_key_field': 'xblock_info.usage_key', 'enabled': False},
+    },
+    'org.openedx.content_authoring.xblock.deleted.v1': {
+        'course-authoring-xblock-lifecycle':
+            {'event_key_field': 'xblock_info.usage_key', 'enabled': False},
+    },
+    'org.openedx.content_authoring.xblock.duplicated.v1': {
+        'course-authoring-xblock-lifecycle':
+            {'event_key_field': 'xblock_info.usage_key', 'enabled': False},
+    },
+}
+derived_collection_entry('EVENT_BUS_PRODUCER_CONFIG', 'org.openedx.learning.certificate.created.v1',
+                         'learning-certificate-lifecycle', 'enabled')
+derived_collection_entry('EVENT_BUS_PRODUCER_CONFIG', 'org.openedx.learning.certificate.revoked.v1',
+                         'learning-certificate-lifecycle', 'enabled')
diff --git a/lms/envs/devstack-experimental.yml b/lms/envs/devstack-experimental.yml
index 50958af4d66f..6d24b63cf920 100644
--- a/lms/envs/devstack-experimental.yml
+++ b/lms/envs/devstack-experimental.yml
@@ -76,6 +76,7 @@ CACHES:
             no_delay: true
             ignore_exc: true
             use_pooling: true
+            connect_timeout: 0.5
         KEY_FUNCTION: common.djangoapps.util.memcache.safe_key
         KEY_PREFIX: celery
         LOCATION:
@@ -87,6 +88,7 @@ CACHES:
             no_delay: true
             ignore_exc: true
             use_pooling: true
+            connect_timeout: 0.5
         KEY_FUNCTION: common.djangoapps.util.memcache.safe_key
         KEY_PREFIX: 78f87108afce
         LOCATION:
@@ -97,6 +99,7 @@ CACHES:
             no_delay: true
             ignore_exc: true
             use_pooling: true
+            connect_timeout: 0.5
         KEY_FUNCTION: common.djangoapps.util.memcache.safe_key
         KEY_PREFIX: course_structure
         LOCATION:
@@ -108,6 +111,7 @@ CACHES:
             no_delay: true
             ignore_exc: true
             use_pooling: true
+            connect_timeout: 0.5
         KEY_FUNCTION: common.djangoapps.util.memcache.safe_key
         KEY_PREFIX: default
         LOCATION:
@@ -119,6 +123,7 @@ CACHES:
             no_delay: true
             ignore_exc: true
             use_pooling: true
+            connect_timeout: 0.5
         KEY_FUNCTION: common.djangoapps.util.memcache.safe_key
         KEY_PREFIX: general
         LOCATION:
@@ -129,6 +134,7 @@ CACHES:
             no_delay: true
             ignore_exc: true
             use_pooling: true
+            connect_timeout: 0.5
         KEY_FUNCTION: common.djangoapps.util.memcache.safe_key
         KEY_PREFIX: mongo_metadata_inheritance
         LOCATION:
@@ -140,6 +146,7 @@ CACHES:
             no_delay: true
             ignore_exc: true
             use_pooling: true
+            connect_timeout: 0.5
         KEY_FUNCTION: common.djangoapps.util.memcache.safe_key
         KEY_PREFIX: 78f87108afce_general
         LOCATION:
diff --git a/lms/envs/devstack.py b/lms/envs/devstack.py
index 4eae239aabbe..5c5aa74e3912 100644
--- a/lms/envs/devstack.py
+++ b/lms/envs/devstack.py
@@ -509,6 +509,11 @@ def should_show_debug_toolbar(request):  # lint-amnesty, pylint: disable=missing
 EVENT_BUS_TOPIC_PREFIX = 'dev'
 EVENT_BUS_CONSUMER = 'edx_event_bus_redis.RedisEventConsumer'
 
+certificate_revoked_event_config = EVENT_BUS_PRODUCER_CONFIG['org.openedx.learning.certificate.revoked.v1']
+certificate_revoked_event_config['learning-certificate-lifecycle']['enabled'] = True
+certificate_created_event_config = EVENT_BUS_PRODUCER_CONFIG['org.openedx.learning.certificate.created.v1']
+certificate_created_event_config['learning-certificate-lifecycle']['enabled'] = True
+
 ######################## Subscriptions API SETTINGS ########################
 SUBSCRIPTIONS_ROOT_URL = "http://host.docker.internal:18750"
 SUBSCRIPTIONS_API_PATH = f"{SUBSCRIPTIONS_ROOT_URL}/api/v1/stripe-subscription/"
@@ -525,6 +530,9 @@ def should_show_debug_toolbar(request):  # lint-amnesty, pylint: disable=missing
 API_DOCUMENTATION_URL = 'https://course-catalog-api-guide.readthedocs.io/en/latest/'
 AUTH_DOCUMENTATION_URL = 'https://course-catalog-api-guide.readthedocs.io/en/latest/authentication/index.html'
 
+############################ AI_TRANSLATIONS ##################################
+AI_TRANSLATIONS_API_URL = 'http://localhost:18760/api/v1'
+
 ################# New settings must go ABOVE this line #################
 ########################################################################
 # See if the developer has any local overrides.
diff --git a/lms/envs/production.py b/lms/envs/production.py
index 0b48d461bb13..9fc0bd54fba4 100644
--- a/lms/envs/production.py
+++ b/lms/envs/production.py
@@ -26,6 +26,7 @@
 import django
 from django.core.exceptions import ImproperlyConfigured
 from edx_django_utils.plugins import add_plugins
+from openedx_events.event_bus import merge_producer_configs
 from path import Path as path
 
 from openedx.core.djangoapps.plugins.constants import ProjectType, SettingsType
@@ -84,6 +85,7 @@ def get_env_setting(setting):
         'MKTG_URL_LINK_MAP',
         'MKTG_URL_OVERRIDES',
         'REST_FRAMEWORK',
+        'EVENT_BUS_PRODUCER_CONFIG',
     ]
     for key in KEYS_WITH_MERGED_VALUES:
         if key in __config_copy__:
@@ -1110,6 +1112,9 @@ def get_env_setting(setting):
 ################### Discussions micro frontend Feedback URL###################
 DISCUSSIONS_MFE_FEEDBACK_URL = ENV_TOKENS.get('DISCUSSIONS_MFE_FEEDBACK_URL', DISCUSSIONS_MFE_FEEDBACK_URL)
 
+############################ AI_TRANSLATIONS URL ##################################
+AI_TRANSLATIONS_API_URL = ENV_TOKENS.get('AI_TRANSLATIONS_API_URL', AI_TRANSLATIONS_API_URL)
+
 ############## DRF overrides ##############
 REST_FRAMEWORK.update(ENV_TOKENS.get('REST_FRAMEWORK', {}))
 
@@ -1133,3 +1138,7 @@ def get_env_setting(setting):
 
 ############## NOTIFICATIONS EXPIRY ##############
 NOTIFICATIONS_EXPIRY = ENV_TOKENS.get('NOTIFICATIONS_EXPIRY', NOTIFICATIONS_EXPIRY)
+
+############## Event bus producer ##############
+EVENT_BUS_PRODUCER_CONFIG = merge_producer_configs(EVENT_BUS_PRODUCER_CONFIG,
+                                                   ENV_TOKENS.get('EVENT_BUS_PRODUCER_CONFIG', {}))
diff --git a/lms/envs/test.py b/lms/envs/test.py
index 32352c849837..7d50c943a3d0 100644
--- a/lms/envs/test.py
+++ b/lms/envs/test.py
@@ -517,25 +517,35 @@
 
 ####################### Authentication Settings ##########################
 JWT_AUTH.update({
-    'JWT_PUBLIC_SIGNING_JWK_SET': (
-        '{"keys": [{"kid": "BTZ9HA6K", "e": "AQAB", "kty": "RSA", "n": "o5cn3ljSRi6FaDEKTn0PS-oL9EFyv1pI7dRgffQLD1qf5D6'
-        'sprmYfWWokSsrWig8u2y0HChSygR6Jn5KXBqQn6FpM0dDJLnWQDRXHLl3Ey1iPYgDSmOIsIGrV9ZyNCQwk03wAgWbfdBTig3QSDYD-sTNOs3pc'
-        '4UD_PqAvU2nz_1SS2ZiOwOn5F6gulE1L0iE3KEUEvOIagfHNVhz0oxa_VRZILkzV-zr6R_TW1m97h4H8jXl_VJyQGyhMGGypuDrQ9_vaY_RLEu'
-        'lLCyY0INglHWQ7pckxBtI5q55-Vio2wgewe2_qYcGsnBGaDNbySAsvYcWRrqDiFyzrJYivodqTQ"}]}'
-    ),
-    'JWT_PRIVATE_SIGNING_JWK': (
-        '{"e": "AQAB", "d": "HIiV7KNjcdhVbpn3KT-I9n3JPf5YbGXsCIedmPqDH1d4QhBofuAqZ9zebQuxkRUpmqtYMv0Zi6ECSUqH387GYQF_Xv'
-        'FUFcjQRPycISd8TH0DAKaDpGr-AYNshnKiEtQpINhcP44I1AYNPCwyoxXA1fGTtmkKChsuWea7o8kytwU5xSejvh5-jiqu2SF4GEl0BEXIAPZs'
-        'gbzoPIWNxgO4_RzNnWs6nJZeszcaDD0CyezVSuH9QcI6g5QFzAC_YuykSsaaFJhZ05DocBsLczShJ9Omf6PnK9xlm26I84xrEh_7x4fVmNBg3x'
-        'WTLh8qOnHqGko93A1diLRCrKHOvnpvgQ", "n": "o5cn3ljSRi6FaDEKTn0PS-oL9EFyv1pI7dRgffQLD1qf5D6sprmYfWWokSsrWig8u2y0H'
-        'ChSygR6Jn5KXBqQn6FpM0dDJLnWQDRXHLl3Ey1iPYgDSmOIsIGrV9ZyNCQwk03wAgWbfdBTig3QSDYD-sTNOs3pc4UD_PqAvU2nz_1SS2ZiOwO'
-        'n5F6gulE1L0iE3KEUEvOIagfHNVhz0oxa_VRZILkzV-zr6R_TW1m97h4H8jXl_VJyQGyhMGGypuDrQ9_vaY_RLEulLCyY0INglHWQ7pckxBtI5'
-        'q55-Vio2wgewe2_qYcGsnBGaDNbySAsvYcWRrqDiFyzrJYivodqTQ", "q": "3T3DEtBUka7hLGdIsDlC96Uadx_q_E4Vb1cxx_4Ss_wGp1Lo'
-        'z3N3ZngGyInsKlmbBgLo1Ykd6T9TRvRNEWEtFSOcm2INIBoVoXk7W5RuPa8Cgq2tjQj9ziGQ08JMejrPlj3Q1wmALJr5VTfvSYBu0WkljhKNCy'
-        '1KB6fCby0C9WE", "p": "vUqzWPZnDG4IXyo-k5F0bHV0BNL_pVhQoLW7eyFHnw74IOEfSbdsMspNcPSFIrtgPsn7981qv3lN_staZ6JflKfH'
-        'ayjB_lvltHyZxfl0dvruShZOx1N6ykEo7YrAskC_qxUyrIvqmJ64zPW3jkuOYrFs7Ykj3zFx3Zq1H5568G0", "kid": "BTZ9HA6K", "kty"'
-        ': "RSA"}'
-    ),
+    'JWT_PUBLIC_SIGNING_JWK_SET': """
+       {
+            "keys":[
+                {
+                    "kid":"BTZ9HA6K",
+                    "e":"AQAB",
+                    "kty":"RSA",
+                    "n":"o5cn3ljSRi6FaDEKTn0PS-oL9EFyv1pI7dRgffQLD1qf5D6sprmYfWWokSsrWig8u2y0HChSygR6Jn5KXBqQn6FpM0dDJLnWQDRXHLl3Ey1iPYgDSmOIsIGrV9ZyNCQwk03wAgWbfdBTig3QSDYD-sTNOs3pc4UD_PqAvU2nz_1SS2ZiOwOn5F6gulE1L0iE3KEUEvOIagfHNVhz0oxa_VRZILkzV-zr6R_TW1m97h4H8jXl_VJyQGyhMGGypuDrQ9_vaY_RLEulLCyY0INglHWQ7pckxBtI5q55-Vio2wgewe2_qYcGsnBGaDNbySAsvYcWRrqDiFyzrJYivodqTQ"
+                }
+            ]
+        }
+    """,
+    'JWT_PRIVATE_SIGNING_JWK': """
+        {
+            "kid": "BTZ9HA6K",
+            "kty": "RSA",
+            "key_ops": [
+                "sign"
+            ],
+            "n": "o5cn3ljSRi6FaDEKTn0PS-oL9EFyv1pI7dRgffQLD1qf5D6sprmYfWWokSsrWig8u2y0HChSygR6Jn5KXBqQn6FpM0dDJLnWQDRXHLl3Ey1iPYgDSmOIsIGrV9ZyNCQwk03wAgWbfdBTig3QSDYD-sTNOs3pc4UD_PqAvU2nz_1SS2ZiOwOn5F6gulE1L0iE3KEUEvOIagfHNVhz0oxa_VRZILkzV-zr6R_TW1m97h4H8jXl_VJyQGyhMGGypuDrQ9_vaY_RLEulLCyY0INglHWQ7pckxBtI5q55-Vio2wgewe2_qYcGsnBGaDNbySAsvYcWRrqDiFyzrJYivodqTQ",
+            "e": "AQAB",
+            "d": "HIiV7KNjcdhVbpn3KT-I9n3JPf5YbGXsCIedmPqDH1d4QhBofuAqZ9zebQuxkRUpmqtYMv0Zi6ECSUqH387GYQF_XvFUFcjQRPycISd8TH0DAKaDpGr-AYNshnKiEtQpINhcP44I1AYNPCwyoxXA1fGTtmkKChsuWea7o8kytwU5xSejvh5-jiqu2SF4GEl0BEXIAPZsgbzoPIWNxgO4_RzNnWs6nJZeszcaDD0CyezVSuH9QcI6g5QFzAC_YuykSsaaFJhZ05DocBsLczShJ9Omf6PnK9xlm26I84xrEh_7x4fVmNBg3xWTLh8qOnHqGko93A1diLRCrKHOvnpvgQ",
+            "p": "3T3DEtBUka7hLGdIsDlC96Uadx_q_E4Vb1cxx_4Ss_wGp1Loz3N3ZngGyInsKlmbBgLo1Ykd6T9TRvRNEWEtFSOcm2INIBoVoXk7W5RuPa8Cgq2tjQj9ziGQ08JMejrPlj3Q1wmALJr5VTfvSYBu0WkljhKNCy1KB6fCby0C9WE",
+            "q": "vUqzWPZnDG4IXyo-k5F0bHV0BNL_pVhQoLW7eyFHnw74IOEfSbdsMspNcPSFIrtgPsn7981qv3lN_staZ6JflKfHayjB_lvltHyZxfl0dvruShZOx1N6ykEo7YrAskC_qxUyrIvqmJ64zPW3jkuOYrFs7Ykj3zFx3Zq1H5568G0",
+            "dp": "Azh08H8r2_sJuBXAzx_mQ6iZnAZQ619PnJFOXjTqnMgcaK8iSHLL2CgDIUQwteUcBphgP0uBrfWIBs5jmM8rUtVz4CcrPb5jdjhHjuu4NxmnFbPlhNoOp8OBUjPP3S-h-fPoaFjxDrUqz_zCdPVzp4S6UTkf6Hu-SiI9CFVFZ8E",
+            "dq": "WQ44_KTIbIej9qnYUPMA1DoaAF8ImVDIdiOp9c79dC7FvCpN3w-lnuugrYDM1j9Tk5bRrY7-JuE6OaKQgOtajoS1BIxjYHj5xAVPD15CVevOihqeq5Zx0ZAAYmmCKRrfUe0iLx2QnIcoKH1-Azs23OXeeo6nysznZjvv9NVJv60",
+            "qi": "KSWGH607H1kNG2okjYdmVdNgLxTUB-Wye9a9FNFE49UmQIOJeZYXtDzcjk8IiK3g-EU3CqBeDKVUgHvHFu4_Wj3IrIhKYizS4BeFmOcPDvylDQCmJcC9tXLQgHkxM_MEJ7iLn9FOLRshh7GPgZphXxMhezM26Cz-8r3_mACHu84"
+        }
+    """,
 })
 # pylint: enable=unicode-format-string  # lint-amnesty, pylint: disable=bad-option-value
 ####################### Plugin Settings ##########################
diff --git a/lms/envs/test_static_optimized.py b/lms/envs/test_static_optimized.py
index 5c9cf062083f..b57276b04036 100644
--- a/lms/envs/test_static_optimized.py
+++ b/lms/envs/test_static_optimized.py
@@ -1,10 +1,6 @@
 """
 Settings used when generating static assets for use in tests.
 
-For example, Bok Choy uses two different settings files:
-1. test_static_optimized is used when invoking collectstatic
-2. bok_choy is used when running CMS and LMS
-
 Note: it isn't possible to have a single settings file, because Django doesn't
 support both generating static assets to a directory and also serving static
 from the same directory.
diff --git a/lms/lib/courseware_search/lms_filter_generator.py b/lms/lib/courseware_search/lms_filter_generator.py
index c4e5ab7ac736..b0c0564df48a 100644
--- a/lms/lib/courseware_search/lms_filter_generator.py
+++ b/lms/lib/courseware_search/lms_filter_generator.py
@@ -28,16 +28,18 @@ def _enrollments_for_user(self, user):
     def field_dictionary(self, **kwargs):
         """ add course if provided otherwise add courses in which the user is enrolled in """
         field_dictionary = super().field_dictionary(**kwargs)
+        course_id = kwargs.get('course_id')
         if not kwargs.get('user'):
             field_dictionary['course'] = []
-        elif not kwargs.get('course_id'):
+        elif not course_id:
             user_enrollments = self._enrollments_for_user(kwargs['user'])
             field_dictionary['course'] = [str(enrollment.course_id) for enrollment in user_enrollments]
 
-        # if we have an org filter, only include results for this org filter
-        course_org_filter = configuration_helpers.get_current_site_orgs()
-        if course_org_filter:
-            field_dictionary['org'] = course_org_filter
+        # if we have no specific course and an org filter, only include results for this org filter
+        if not course_id:
+            course_org_filter = configuration_helpers.get_current_site_orgs()
+            if course_org_filter:
+                field_dictionary['org'] = course_org_filter
 
         return field_dictionary
 
@@ -46,6 +48,11 @@ def exclude_dictionary(self, **kwargs):
             Exclude any courses defined outside the current org.
         """
         exclude_dictionary = super().exclude_dictionary(**kwargs)
+        # If we are already filtering to a single course, we do not need
+        # the further course filters below.
+        if kwargs.get('course_id'):
+            return exclude_dictionary
+
         course_org_filter = configuration_helpers.get_current_site_orgs()
         # If we have a course filter we are ensuring that we only get those courses above
         if not course_org_filter:
diff --git a/lms/static/js/certificates/certificates.js b/lms/static/js/certificates/certificates.js
index 6cc19796c488..e69de29bb2d1 100644
--- a/lms/static/js/certificates/certificates.js
+++ b/lms/static/js/certificates/certificates.js
@@ -1,11 +0,0 @@
-$(function() {
-    'use strict';
-
-    $('.action-share-mozillaopenbadges').click(function(event) {
-        $('.badges-overlay').fadeIn();
-        event.preventDefault();
-    });
-    $('.badges-modal .close').click(function() {
-        $('.badges-overlay').fadeOut();
-    });
-});
diff --git a/lms/static/js/certificates/views/certificate_allowlist.js b/lms/static/js/certificates/views/certificate_allowlist.js
index 89970dac7b30..af46b2d28f60 100644
--- a/lms/static/js/certificates/views/certificate_allowlist.js
+++ b/lms/static/js/certificates/views/certificate_allowlist.js
@@ -85,7 +85,7 @@
                     HtmlUtils.HTML('<p>'),
                     _.escape(message),
                     HtmlUtils.HTML('</p>')
-                ))
+                ).toString())
                     .focus();
                 $(this.message_div).fadeOut(6000, 'linear');
             },
diff --git a/lms/static/js/i18n/eo/djangojs.js b/lms/static/js/i18n/eo/djangojs.js
index 5ef96bc3e679..8b51840c3712 100644
--- a/lms/static/js/i18n/eo/djangojs.js
+++ b/lms/static/js/i18n/eo/djangojs.js
@@ -132,8 +132,6 @@
     "Access to some content in this {blockType} is restricted to specific groups of learners.": "\u00c0\u00e7\u00e7\u00e9ss t\u00f6 s\u00f6m\u00e9 \u00e7\u00f6nt\u00e9nt \u00efn th\u00efs {blockType} \u00efs r\u00e9str\u00ef\u00e7t\u00e9d t\u00f6 sp\u00e9\u00e7\u00eff\u00ef\u00e7 gr\u00f6\u00fcps \u00f6f l\u00e9\u00e4rn\u00e9rs. \u2c60'\u03c3\u044f\u0454\u043c \u03b9\u03c1\u0455\u03c5\u043c \u2202\u03c3\u0142\u03c3\u044f \u0455\u03b9\u0442 \u03b1\u043c\u0454\u0442, \u00a2\u03c3\u03b7\u0455\u0454\u00a2\u0442\u0454#",
     "Access to this unit is restricted to: {selectedGroupsLabel}": "\u00c0\u00e7\u00e7\u00e9ss t\u00f6 th\u00efs \u00fcn\u00eft \u00efs r\u00e9str\u00ef\u00e7t\u00e9d t\u00f6: {selectedGroupsLabel} \u2c60'\u03c3\u044f\u0454\u043c \u03b9\u03c1\u0455\u03c5\u043c \u2202\u03c3\u0142\u03c3\u044f \u0455\u03b9\u0442 \u03b1\u043c\u0454\u0442, \u00a2\u03c3\u03b7\u0455\u0454\u00a2\u0442\u0454\u0442\u03c5\u044f #",
     "Access to this {blockType} is restricted to: {selectedGroupsLabel}": "\u00c0\u00e7\u00e7\u00e9ss t\u00f6 th\u00efs {blockType} \u00efs r\u00e9str\u00ef\u00e7t\u00e9d t\u00f6: {selectedGroupsLabel} \u2c60'\u03c3\u044f\u0454\u043c \u03b9\u03c1\u0455\u03c5\u043c \u2202\u03c3\u0142\u03c3\u044f \u0455\u03b9\u0442 \u03b1\u043c\u0454\u0442, \u00a2\u03c3\u03b7\u0455\u0454\u00a2\u0442\u0454\u0442\u03c5\u044f#",
-    "Accomplishments": "\u00c0\u00e7\u00e7\u00f6mpl\u00efshm\u00e9nts \u2c60'\u03c3\u044f\u0454\u043c \u03b9\u03c1\u0455\u03c5\u043c \u2202\u03c3\u0142\u03c3\u044f \u0455\u03b9\u0442 \u03b1#",
-    "Accomplishments Pagination": "\u00c0\u00e7\u00e7\u00f6mpl\u00efshm\u00e9nts P\u00e4g\u00efn\u00e4t\u00ef\u00f6n \u2c60'\u03c3\u044f\u0454\u043c \u03b9\u03c1\u0455\u03c5\u043c \u2202\u03c3\u0142\u03c3\u044f \u0455\u03b9\u0442 \u03b1\u043c\u0454\u0442, \u00a2\u03c3\u03b7\u0455#",
     "According to our records, you are not enrolled in any courses included in your {programName} program subscription. Enroll in a course from the {i_start}Program Details{i_end} page.": "\u00c0\u00e7\u00e7\u00f6rd\u00efng t\u00f6 \u00f6\u00fcr r\u00e9\u00e7\u00f6rds, \u00fd\u00f6\u00fc \u00e4r\u00e9 n\u00f6t \u00e9nr\u00f6ll\u00e9d \u00efn \u00e4n\u00fd \u00e7\u00f6\u00fcrs\u00e9s \u00efn\u00e7l\u00fcd\u00e9d \u00efn \u00fd\u00f6\u00fcr {programName} pr\u00f6gr\u00e4m s\u00fc\u00dfs\u00e7r\u00efpt\u00ef\u00f6n. \u00c9nr\u00f6ll \u00efn \u00e4 \u00e7\u00f6\u00fcrs\u00e9 fr\u00f6m th\u00e9 {i_start}Pr\u00f6gr\u00e4m D\u00e9t\u00e4\u00efls{i_end} p\u00e4g\u00e9. \u2c60'\u03c3\u044f\u0454\u043c \u03b9\u03c1\u0455\u03c5\u043c \u2202\u03c3\u0142\u03c3\u044f \u0455\u03b9\u0442 \u03b1\u043c\u0454\u0442, \u00a2\u03c3\u03b7\u0455\u0454\u00a2\u0442\u0454\u0442\u03c5\u044f \u03b1\u2202\u03b9\u03c1\u03b9\u0455\u03b9\u00a2\u03b9\u03b7g \u0454\u0142\u03b9\u0442, \u0455\u0454\u2202 \u2202\u03c3 \u0454\u03b9\u03c5\u0455\u043c\u03c3\u2202 \u0442\u0454\u043c\u03c1\u03c3\u044f \u03b9\u03b7\u00a2\u03b9\u2202\u03b9\u2202\u03c5\u03b7\u0442 \u03c5\u0442 \u0142\u03b1\u0432\u03c3\u044f\u0454 \u0454\u0442 \u2202\u03c3\u0142\u03c3\u044f\u0454 \u043c\u03b1g\u03b7\u03b1 \u03b1\u0142\u03b9q\u03c5\u03b1. \u03c5\u0442 \u0454\u03b7\u03b9\u043c \u03b1\u2202 \u043c\u03b9\u03b7\u03b9\u043c \u03bd\u0454\u03b7\u03b9\u03b1\u043c, q\u03c5\u03b9\u0455 \u03b7\u03c3\u0455\u0442\u044f\u03c5\u2202 \u0454\u03c7\u0454\u044f\u00a2\u03b9\u0442\u03b1\u0442\u03b9\u03c3\u03b7 \u03c5\u0142\u0142\u03b1\u043c\u00a2\u03c3 \u0142\u03b1\u0432\u03c3\u044f\u03b9\u0455 \u03b7\u03b9\u0455\u03b9 \u03c5\u0442 \u03b1\u0142\u03b9q\u03c5\u03b9\u03c1 \u0454\u03c7 \u0454\u03b1 \u00a2\u03c3\u043c\u043c\u03c3\u2202\u03c3 \u00a2\u03c3\u03b7\u0455\u0454q\u03c5\u03b1\u0442. \u2202\u03c5\u03b9\u0455 \u03b1\u03c5\u0442\u0454 \u03b9\u044f\u03c5\u044f\u0454 \u2202\u03c3\u0142\u03c3\u044f \u03b9\u03b7 \u044f\u0454\u03c1\u044f\u0454\u043d\u0454\u03b7\u2202\u0454\u044f\u03b9\u0442 \u03b9\u03b7 \u03bd\u03c3\u0142\u03c5\u03c1\u0442\u03b1\u0442\u0454 \u03bd\u0454\u0142\u03b9\u0442 \u0454\u0455\u0455\u0454 \u00a2\u03b9\u0142\u0142\u03c5\u043c \u2202\u03c3\u0142\u03c3\u044f\u0454 \u0454\u03c5 \u0192\u03c5g\u03b9\u03b1\u0442 \u03b7\u03c5\u0142\u0142\u03b1 \u03c1\u03b1\u044f\u03b9\u03b1\u0442\u03c5\u044f. \u0454\u03c7\u00a2\u0454\u03c1\u0442\u0454\u03c5\u044f \u0455\u03b9\u03b7\u0442 \u03c3\u00a2\u00a2\u03b1\u0454\u00a2\u03b1\u0442 \u00a2\u03c5\u03c1\u03b9\u2202\u03b1\u0442\u03b1\u0442 \u03b7\u03c3\u03b7 \u03c1\u044f\u03c3\u03b9\u2202\u0454\u03b7\u0442, \u0455\u03c5\u03b7\u0442 \u03b9\u03b7 \u00a2\u03c5\u0142\u03c1\u03b1 q\u03c5\u03b9 \u03c3\u0192\u0192\u03b9\u00a2\u03b9\u03b1 \u2202\u0454\u0455\u0454\u044f\u03c5#",
     "Account": "\u00c0\u00e7\u00e7\u00f6\u00fcnt \u2c60'\u03c3\u044f\u0454\u043c \u03b9\u03c1\u0455\u03c5\u043c #",
     "Account Information": "\u00c0\u00e7\u00e7\u00f6\u00fcnt \u00ccnf\u00f6rm\u00e4t\u00ef\u00f6n \u2c60'\u03c3\u044f\u0454\u043c \u03b9\u03c1\u0455\u03c5\u043c \u2202\u03c3\u0142\u03c3\u044f \u0455\u03b9\u0442 \u03b1\u043c\u0454\u0442,#",
@@ -538,7 +536,6 @@
     "Create a content group": "\u00c7r\u00e9\u00e4t\u00e9 \u00e4 \u00e7\u00f6nt\u00e9nt gr\u00f6\u00fcp \u2c60'\u03c3\u044f\u0454\u043c \u03b9\u03c1\u0455\u03c5\u043c \u2202\u03c3\u0142\u03c3\u044f \u0455\u03b9\u0442 \u03b1\u043c\u0454\u0442, \u00a2#",
     "Create a new team if you can't find an existing team to join, or if you would like to learn with friends you know.": "\u00c7r\u00e9\u00e4t\u00e9 \u00e4 n\u00e9w t\u00e9\u00e4m \u00eff \u00fd\u00f6\u00fc \u00e7\u00e4n't f\u00efnd \u00e4n \u00e9x\u00efst\u00efng t\u00e9\u00e4m t\u00f6 j\u00f6\u00efn, \u00f6r \u00eff \u00fd\u00f6\u00fc w\u00f6\u00fcld l\u00efk\u00e9 t\u00f6 l\u00e9\u00e4rn w\u00efth fr\u00ef\u00e9nds \u00fd\u00f6\u00fc kn\u00f6w. \u2c60'\u03c3\u044f\u0454\u043c \u03b9\u03c1\u0455\u03c5\u043c \u2202\u03c3\u0142#",
     "Create a report of problem responses": "\u00c7r\u00e9\u00e4t\u00e9 \u00e4 r\u00e9p\u00f6rt \u00f6f pr\u00f6\u00dfl\u00e9m r\u00e9sp\u00f6ns\u00e9s \u2c60'\u03c3\u044f\u0454\u043c \u03b9\u03c1\u0455\u03c5\u043c \u2202\u03c3\u0142\u03c3\u044f \u0455\u03b9\u0442 \u03b1\u043c\u0454\u0442, \u00a2\u03c3\u03b7\u0455\u0454\u00a2\u0442\u0454\u0442\u03c5#",
-    "Create a {link_start}Mozilla Backpack{link_end} account, or log in to your existing account": "\u00c7r\u00e9\u00e4t\u00e9 \u00e4 {link_start}M\u00f6z\u00efll\u00e4 B\u00e4\u00e7kp\u00e4\u00e7k{link_end} \u00e4\u00e7\u00e7\u00f6\u00fcnt, \u00f6r l\u00f6g \u00efn t\u00f6 \u00fd\u00f6\u00fcr \u00e9x\u00efst\u00efng \u00e4\u00e7\u00e7\u00f6\u00fcnt \u2c60'\u03c3\u044f\u0454\u043c \u03b9\u03c1\u0455\u03c5\u043c \u2202\u03c3\u0142\u03c3\u044f \u0455\u03b9\u0442 \u03b1\u043c\u0454\u0442, \u00a2\u03c3\u03b7\u0455\u0454\u00a2\u0442\u0454\u0442\u03c5#",
     "Create account using %(providerName)s.": "\u00c7r\u00e9\u00e4t\u00e9 \u00e4\u00e7\u00e7\u00f6\u00fcnt \u00fcs\u00efng %(providerName)s. \u2c60'\u03c3\u044f\u0454\u043c \u03b9\u03c1\u0455\u03c5\u043c \u2202\u03c3\u0142\u03c3\u044f \u0455\u03b9\u0442 \u03b1\u043c\u0454\u0442, \u00a2\u03c3\u03b7\u0455#",
     "Create an Account": "\u00c7r\u00e9\u00e4t\u00e9 \u00e4n \u00c0\u00e7\u00e7\u00f6\u00fcnt \u2c60'\u03c3\u044f\u0454\u043c \u03b9\u03c1\u0455\u03c5\u043c \u2202\u03c3\u0142\u03c3\u044f \u0455\u03b9\u0442 \u03b1\u043c\u0454#",
     "Create an Account.": "\u00c7r\u00e9\u00e4t\u00e9 \u00e4n \u00c0\u00e7\u00e7\u00f6\u00fcnt. \u2c60'\u03c3\u044f\u0454\u043c \u03b9\u03c1\u0455\u03c5\u043c \u2202\u03c3\u0142\u03c3\u044f \u0455\u03b9\u0442 \u03b1\u043c\u0454\u0442#",
@@ -651,7 +648,6 @@
     "Duplicate": "D\u00fcpl\u00ef\u00e7\u00e4t\u00e9 \u2c60'\u03c3\u044f\u0454\u043c \u03b9\u03c1\u0455\u03c5\u043c \u2202\u03c3\u0142#",
     "Duplicating": "D\u00fcpl\u00ef\u00e7\u00e4t\u00efng \u2c60'\u03c3\u044f\u0454\u043c \u03b9\u03c1\u0455\u03c5\u043c \u2202\u03c3\u0142\u03c3\u044f #",
     "Duration (sec)": "D\u00fcr\u00e4t\u00ef\u00f6n (s\u00e9\u00e7) \u2c60'\u03c3\u044f\u0454\u043c \u03b9\u03c1\u0455\u03c5\u043c \u2202\u03c3\u0142\u03c3\u044f \u0455\u03b9\u0442#",
-    "Earned %(created)s.": "\u00c9\u00e4rn\u00e9d %(created)s. \u2c60'\u03c3\u044f\u0454\u043c \u03b9\u03c1\u0455\u03c5\u043c \u2202\u03c3\u0142\u03c3\u044f #",
     "Earned Certificates": "\u00c9\u00e4rn\u00e9d \u00c7\u00e9rt\u00eff\u00ef\u00e7\u00e4t\u00e9s \u2c60'\u03c3\u044f\u0454\u043c \u03b9\u03c1\u0455\u03c5\u043c \u2202\u03c3\u0142\u03c3\u044f \u0455\u03b9\u0442 \u03b1\u043c\u0454\u0442,#",
     "EdX doesn't have a timed transcript for this video in Studio, but we found a transcript on YouTube. You can import the YouTube transcript or upload your own .srt transcript file.": "\u00c9dX d\u00f6\u00e9sn't h\u00e4v\u00e9 \u00e4 t\u00efm\u00e9d tr\u00e4ns\u00e7r\u00efpt f\u00f6r th\u00efs v\u00efd\u00e9\u00f6 \u00efn St\u00fcd\u00ef\u00f6, \u00df\u00fct w\u00e9 f\u00f6\u00fcnd \u00e4 tr\u00e4ns\u00e7r\u00efpt \u00f6n \u00dd\u00f6\u00fcT\u00fc\u00df\u00e9. \u00dd\u00f6\u00fc \u00e7\u00e4n \u00efmp\u00f6rt th\u00e9 \u00dd\u00f6\u00fcT\u00fc\u00df\u00e9 tr\u00e4ns\u00e7r\u00efpt \u00f6r \u00fcpl\u00f6\u00e4d \u00fd\u00f6\u00fcr \u00f6wn .srt tr\u00e4ns\u00e7r\u00efpt f\u00efl\u00e9. \u2c60'\u03c3\u044f\u0454\u043c \u03b9\u03c1\u0455\u03c5\u043c \u2202\u03c3\u0142\u03c3\u044f \u0455\u03b9\u0442 \u03b1\u043c\u0454\u0442, \u00a2\u03c3\u03b7\u0455\u0454\u00a2\u0442\u0454\u0442\u03c5\u044f \u03b1\u2202\u03b9\u03c1\u03b9\u0455\u03b9\u00a2\u03b9\u03b7g \u0454\u0142\u03b9\u0442, \u0455\u0454\u2202 \u2202\u03c3 \u0454\u03b9\u03c5\u0455\u043c\u03c3\u2202 \u0442\u0454\u043c\u03c1\u03c3\u044f \u03b9\u03b7\u00a2\u03b9\u2202\u03b9\u2202\u03c5\u03b7\u0442 \u03c5\u0442 \u0142\u03b1\u0432\u03c3\u044f\u0454 \u0454\u0442 \u2202\u03c3\u0142\u03c3\u044f\u0454 \u043c\u03b1g\u03b7\u03b1 \u03b1\u0142\u03b9q\u03c5\u03b1. \u03c5\u0442 \u0454\u03b7\u03b9\u043c \u03b1\u2202 \u043c\u03b9\u03b7\u03b9\u043c \u03bd\u0454\u03b7\u03b9\u03b1\u043c, q\u03c5\u03b9\u0455 \u03b7\u03c3\u0455\u0442\u044f\u03c5\u2202 \u0454\u03c7\u0454\u044f\u00a2\u03b9\u0442\u03b1\u0442\u03b9\u03c3\u03b7 \u03c5\u0142\u0142\u03b1\u043c\u00a2\u03c3 \u0142\u03b1\u0432\u03c3\u044f\u03b9\u0455 \u03b7\u03b9\u0455\u03b9 \u03c5\u0442 \u03b1\u0142\u03b9q\u03c5\u03b9\u03c1 \u0454\u03c7 \u0454\u03b1 \u00a2\u03c3\u043c\u043c\u03c3\u2202\u03c3 \u00a2\u03c3\u03b7\u0455\u0454q\u03c5\u03b1\u0442. \u2202\u03c5\u03b9\u0455 \u03b1\u03c5\u0442\u0454 \u03b9\u044f\u03c5\u044f\u0454 \u2202\u03c3\u0142\u03c3\u044f \u03b9\u03b7 \u044f\u0454\u03c1\u044f\u0454\u043d\u0454\u03b7\u2202\u0454\u044f\u03b9\u0442 \u03b9\u03b7 \u03bd\u03c3\u0142\u03c5\u03c1\u0442\u03b1\u0442\u0454 \u03bd\u0454\u0142\u03b9\u0442 \u0454\u0455\u0455\u0454 \u00a2\u03b9\u0142\u0142\u03c5\u043c \u2202\u03c3\u0142\u03c3\u044f\u0454 \u0454\u03c5 \u0192\u03c5g\u03b9\u03b1\u0442 \u03b7\u03c5\u0142\u0142\u03b1 \u03c1\u03b1\u044f\u03b9\u03b1\u0442\u03c5\u044f. \u0454\u03c7\u00a2\u0454\u03c1\u0442\u0454\u03c5\u044f \u0455\u03b9\u03b7\u0442 \u03c3\u00a2\u00a2\u03b1\u0454\u00a2\u03b1\u0442 \u00a2\u03c5\u03c1\u03b9\u2202\u03b1\u0442\u03b1\u0442 \u03b7\u03c3\u03b7 \u03c1\u044f\u03c3\u03b9\u2202\u0454\u03b7\u0442, \u0455\u03c5\u03b7\u0442 \u03b9\u03b7 #",
     "EdX doesn\\'t have a timed transcript for this video. Please upload an .srt file.": "\u00c9dX d\u00f6\u00e9sn\\'t h\u00e4v\u00e9 \u00e4 t\u00efm\u00e9d tr\u00e4ns\u00e7r\u00efpt f\u00f6r th\u00efs v\u00efd\u00e9\u00f6. Pl\u00e9\u00e4s\u00e9 \u00fcpl\u00f6\u00e4d \u00e4n .srt f\u00efl\u00e9. \u2c60'\u03c3\u044f\u0454\u043c \u03b9\u03c1\u0455\u03c5\u043c \u2202\u03c3\u0142\u03c3\u044f \u0455\u03b9\u0442 \u03b1\u043c\u0454\u0442, \u00a2\u03c3\u03b7\u0455\u0454\u00a2\u0442\u0454#",
@@ -823,7 +819,6 @@
     "Financial Assistance": "F\u00efn\u00e4n\u00e7\u00ef\u00e4l \u00c0ss\u00efst\u00e4n\u00e7\u00e9 \u2c60'\u03c3\u044f\u0454\u043c \u03b9\u03c1\u0455\u03c5\u043c \u2202\u03c3\u0142\u03c3\u044f \u0455\u03b9\u0442 \u03b1\u043c\u0454\u0442, #",
     "Financial Assistance Application": "F\u00efn\u00e4n\u00e7\u00ef\u00e4l \u00c0ss\u00efst\u00e4n\u00e7\u00e9 \u00c0ppl\u00ef\u00e7\u00e4t\u00ef\u00f6n \u2c60'\u03c3\u044f\u0454\u043c \u03b9\u03c1\u0455\u03c5\u043c \u2202\u03c3\u0142\u03c3\u044f \u0455\u03b9\u0442 \u03b1\u043c\u0454\u0442, \u00a2\u03c3\u03b7\u0455\u0454\u00a2\u0442\u0454#",
     "Find": "F\u00efnd \u2c60'\u03c3\u044f\u0454\u043c \u03b9#",
-    "Find a course": "F\u00efnd \u00e4 \u00e7\u00f6\u00fcrs\u00e9 \u2c60'\u03c3\u044f\u0454\u043c \u03b9\u03c1\u0455\u03c5\u043c \u2202\u03c3\u0142\u03c3\u044f \u0455\u03b9#",
     "Find and replace": "F\u00efnd \u00e4nd r\u00e9pl\u00e4\u00e7\u00e9 \u2c60'\u03c3\u044f\u0454\u043c \u03b9\u03c1\u0455\u03c5\u043c \u2202\u03c3\u0142\u03c3\u044f \u0455\u03b9\u0442 \u03b1\u043c#",
     "Find answers to the top questions asked by learners.": "F\u00efnd \u00e4nsw\u00e9rs t\u00f6 th\u00e9 t\u00f6p q\u00fc\u00e9st\u00ef\u00f6ns \u00e4sk\u00e9d \u00df\u00fd l\u00e9\u00e4rn\u00e9rs. \u2c60'\u03c3\u044f\u0454\u043c \u03b9\u03c1\u0455\u03c5\u043c \u2202\u03c3\u0142\u03c3\u044f \u0455\u03b9\u0442 \u03b1\u043c\u0454\u0442, \u00a2\u03c3\u03b7\u0455\u0454\u00a2\u0442\u0454\u0442\u03c5\u044f \u03b1#",
     "Find discussions": "F\u00efnd d\u00efs\u00e7\u00fcss\u00ef\u00f6ns \u2c60'\u03c3\u044f\u0454\u043c \u03b9\u03c1\u0455\u03c5\u043c \u2202\u03c3\u0142\u03c3\u044f \u0455\u03b9\u0442 \u03b1\u043c#",
@@ -1576,10 +1571,7 @@
     "Settings": "S\u00e9tt\u00efngs \u2c60'\u03c3\u044f\u0454\u043c \u03b9\u03c1\u0455\u03c5\u043c \u2202#",
     "Settings updated": "S\u00e9tt\u00efngs \u00fcpd\u00e4t\u00e9d \u2c60'\u03c3\u044f\u0454\u043c \u03b9\u03c1\u0455\u03c5\u043c \u2202\u03c3\u0142\u03c3\u044f \u0455\u03b9\u0442 \u03b1\u043c#",
     "Setup Started": "S\u00e9t\u00fcp St\u00e4rt\u00e9d \u2c60'\u03c3\u044f\u0454\u043c \u03b9\u03c1\u0455\u03c5\u043c \u2202\u03c3\u0142\u03c3\u044f \u0455\u03b9#",
-    "Share": "Sh\u00e4r\u00e9 \u2c60'\u03c3\u044f\u0454\u043c \u03b9\u03c1\u0455#",
     "Share Alike": "Sh\u00e4r\u00e9 \u00c0l\u00efk\u00e9 \u2c60'\u03c3\u044f\u0454\u043c \u03b9\u03c1\u0455\u03c5\u043c \u2202\u03c3\u0142\u03c3\u044f #",
-    "Share on Mozilla Backpack": "Sh\u00e4r\u00e9 \u00f6n M\u00f6z\u00efll\u00e4 B\u00e4\u00e7kp\u00e4\u00e7k \u2c60'\u03c3\u044f\u0454\u043c \u03b9\u03c1\u0455\u03c5\u043c \u2202\u03c3\u0142\u03c3\u044f \u0455\u03b9\u0442 \u03b1\u043c\u0454\u0442, \u00a2\u03c3\u03b7\u0455#",
-    "Share your \"%(display_name)s\" award": "Sh\u00e4r\u00e9 \u00fd\u00f6\u00fcr \"%(display_name)s\" \u00e4w\u00e4rd \u2c60'\u03c3\u044f\u0454\u043c \u03b9\u03c1\u0455\u03c5\u043c \u2202\u03c3\u0142\u03c3\u044f \u0455\u03b9\u0442 \u03b1\u043c\u0454\u0442, \u00a2#",
     "Short explanation": "Sh\u00f6rt \u00e9xpl\u00e4n\u00e4t\u00ef\u00f6n \u2c60'\u03c3\u044f\u0454\u043c \u03b9\u03c1\u0455\u03c5\u043c \u2202\u03c3\u0142\u03c3\u044f \u0455\u03b9\u0442 \u03b1\u043c\u0454#",
     "Show": "Montru",
     "Show All": "Sh\u00f6w \u00c0ll \u2c60'\u03c3\u044f\u0454\u043c \u03b9\u03c1\u0455\u03c5\u043c \u2202#",
@@ -1666,7 +1658,6 @@
     "Start of transcript. Skip to the end.": "St\u00e4rt \u00f6f tr\u00e4ns\u00e7r\u00efpt. Sk\u00efp t\u00f6 th\u00e9 \u00e9nd. \u2c60'\u03c3\u044f\u0454\u043c \u03b9\u03c1\u0455\u03c5\u043c \u2202\u03c3\u0142\u03c3\u044f \u0455\u03b9\u0442 \u03b1\u043c\u0454\u0442, \u00a2\u03c3\u03b7\u0455\u0454\u00a2\u0442\u0454\u0442\u03c5#",
     "Start regenerating certificates for students in this course?": "St\u00e4rt r\u00e9g\u00e9n\u00e9r\u00e4t\u00efng \u00e7\u00e9rt\u00eff\u00ef\u00e7\u00e4t\u00e9s f\u00f6r st\u00fcd\u00e9nts \u00efn th\u00efs \u00e7\u00f6\u00fcrs\u00e9? \u2c60'\u03c3\u044f\u0454\u043c \u03b9\u03c1\u0455\u03c5\u043c \u2202\u03c3\u0142\u03c3\u044f \u0455\u03b9\u0442 \u03b1\u043c\u0454\u0442, \u00a2\u03c3\u03b7\u0455\u0454\u00a2\u0442\u0454\u0442\u03c5\u044f \u03b1#",
     "Start search": "St\u00e4rt s\u00e9\u00e4r\u00e7h \u2c60'\u03c3\u044f\u0454\u043c \u03b9\u03c1\u0455\u03c5\u043c \u2202\u03c3\u0142\u03c3\u044f \u0455#",
-    "Start working toward your next learning goal.": "St\u00e4rt w\u00f6rk\u00efng t\u00f6w\u00e4rd \u00fd\u00f6\u00fcr n\u00e9xt l\u00e9\u00e4rn\u00efng g\u00f6\u00e4l. \u2c60'\u03c3\u044f\u0454\u043c \u03b9\u03c1\u0455\u03c5\u043c \u2202\u03c3\u0142\u03c3\u044f \u0455\u03b9\u0442 \u03b1\u043c\u0454\u0442, \u00a2\u03c3\u03b7\u0455\u0454\u00a2\u0442\u0454\u0442\u03c5\u044f #",
     "Start {trialLength}-day free trial": "St\u00e4rt {trialLength}-d\u00e4\u00fd fr\u00e9\u00e9 tr\u00ef\u00e4l \u2c60'\u03c3\u044f\u0454\u043c \u03b9\u03c1\u0455\u03c5\u043c \u2202\u03c3\u0142\u03c3\u044f \u0455\u03b9\u0442 \u03b1\u043c\u0454\u0442, \u00a2\u03c3\u03b7#",
     "Started": "St\u00e4rt\u00e9d \u2c60'\u03c3\u044f\u0454\u043c \u03b9\u03c1\u0455\u03c5\u043c #",
     "Started entrance exam rescore task for student '{student_id}'. Click the 'Show Task Status' button to see the status of the task.": "St\u00e4rt\u00e9d \u00e9ntr\u00e4n\u00e7\u00e9 \u00e9x\u00e4m r\u00e9s\u00e7\u00f6r\u00e9 t\u00e4sk f\u00f6r st\u00fcd\u00e9nt '{student_id}'. \u00c7l\u00ef\u00e7k th\u00e9 'Sh\u00f6w T\u00e4sk St\u00e4t\u00fcs' \u00df\u00fctt\u00f6n t\u00f6 s\u00e9\u00e9 th\u00e9 st\u00e4t\u00fcs \u00f6f th\u00e9 t\u00e4sk. \u2c60'\u03c3\u044f\u0454\u043c \u03b9\u03c1\u0455\u03c5#",
@@ -1976,7 +1967,6 @@
     "To receive a certificate, you must also verify your identity.": "T\u00f6 r\u00e9\u00e7\u00e9\u00efv\u00e9 \u00e4 \u00e7\u00e9rt\u00eff\u00ef\u00e7\u00e4t\u00e9, \u00fd\u00f6\u00fc m\u00fcst \u00e4ls\u00f6 v\u00e9r\u00eff\u00fd \u00fd\u00f6\u00fcr \u00efd\u00e9nt\u00eft\u00fd. \u2c60'\u03c3\u044f\u0454\u043c \u03b9\u03c1\u0455\u03c5\u043c \u2202\u03c3\u0142\u03c3\u044f \u0455\u03b9\u0442 \u03b1\u043c\u0454\u0442, \u00a2\u03c3\u03b7\u0455\u0454\u00a2\u0442\u0454\u0442\u03c5\u044f \u03b1#",
     "To receive credit for problems, you must select \"Submit\" for each problem before you select \"End My Exam\".": "T\u00f6 r\u00e9\u00e7\u00e9\u00efv\u00e9 \u00e7r\u00e9d\u00eft f\u00f6r pr\u00f6\u00dfl\u00e9ms, \u00fd\u00f6\u00fc m\u00fcst s\u00e9l\u00e9\u00e7t \"S\u00fc\u00dfm\u00eft\" f\u00f6r \u00e9\u00e4\u00e7h pr\u00f6\u00dfl\u00e9m \u00df\u00e9f\u00f6r\u00e9 \u00fd\u00f6\u00fc s\u00e9l\u00e9\u00e7t \"\u00c9nd M\u00fd \u00c9x\u00e4m\". \u2c60'\u03c3\u044f\u0454\u043c \u03b9\u03c1\u0455\u03c5\u043c \u2202\u03c3\u0142\u03c3\u044f \u0455\u03b9\u0442 #",
     "To review learner cohort assignments or see the results of uploading a CSV file, download course profile information or cohort results on the {link_start}Data Download{link_end} page.": "T\u00f6 r\u00e9v\u00ef\u00e9w l\u00e9\u00e4rn\u00e9r \u00e7\u00f6h\u00f6rt \u00e4ss\u00efgnm\u00e9nts \u00f6r s\u00e9\u00e9 th\u00e9 r\u00e9s\u00fclts \u00f6f \u00fcpl\u00f6\u00e4d\u00efng \u00e4 \u00c7SV f\u00efl\u00e9, d\u00f6wnl\u00f6\u00e4d \u00e7\u00f6\u00fcrs\u00e9 pr\u00f6f\u00efl\u00e9 \u00efnf\u00f6rm\u00e4t\u00ef\u00f6n \u00f6r \u00e7\u00f6h\u00f6rt r\u00e9s\u00fclts \u00f6n th\u00e9 {link_start}D\u00e4t\u00e4 D\u00f6wnl\u00f6\u00e4d{link_end} p\u00e4g\u00e9. \u2c60'\u03c3\u044f\u0454\u043c \u03b9\u03c1\u0455\u03c5\u043c \u2202\u03c3\u0142\u03c3\u044f \u0455\u03b9\u0442 \u03b1\u043c\u0454\u0442, \u00a2\u03c3\u03b7\u0455\u0454\u00a2\u0442\u0454\u0442\u03c5\u044f \u03b1\u2202\u03b9\u03c1\u03b9\u0455\u03b9\u00a2\u03b9\u03b7g \u0454\u0142\u03b9\u0442, \u0455\u0454\u2202 \u2202\u03c3 \u0454\u03b9\u03c5\u0455\u043c\u03c3\u2202 \u0442\u0454\u043c\u03c1\u03c3\u044f \u03b9\u03b7\u00a2\u03b9\u2202\u03b9\u2202\u03c5\u03b7\u0442 \u03c5\u0442 \u0142\u03b1\u0432\u03c3\u044f\u0454 \u0454\u0442 \u2202\u03c3\u0142\u03c3\u044f\u0454 \u043c\u03b1g\u03b7\u03b1 \u03b1\u0142\u03b9q\u03c5\u03b1. \u03c5\u0442 \u0454\u03b7\u03b9\u043c \u03b1\u2202 \u043c\u03b9\u03b7\u03b9\u043c \u03bd\u0454\u03b7\u03b9\u03b1\u043c, q\u03c5\u03b9\u0455 \u03b7\u03c3\u0455\u0442\u044f\u03c5\u2202 \u0454\u03c7\u0454\u044f\u00a2\u03b9\u0442\u03b1\u0442\u03b9\u03c3\u03b7 \u03c5\u0142\u0142\u03b1\u043c\u00a2\u03c3 \u0142\u03b1\u0432\u03c3\u044f\u03b9\u0455 \u03b7\u03b9\u0455\u03b9 \u03c5\u0442 \u03b1\u0142\u03b9q\u03c5\u03b9\u03c1 \u0454\u03c7 \u0454\u03b1 \u00a2\u03c3\u043c\u043c\u03c3\u2202\u03c3 \u00a2\u03c3\u03b7\u0455\u0454q\u03c5\u03b1\u0442. \u2202\u03c5\u03b9\u0455 \u03b1\u03c5\u0442\u0454 \u03b9\u044f\u03c5\u044f\u0454 \u2202\u03c3\u0142\u03c3\u044f \u03b9\u03b7 \u044f\u0454\u03c1\u044f\u0454\u043d\u0454\u03b7\u2202\u0454\u044f\u03b9\u0442 \u03b9\u03b7 \u03bd\u03c3\u0142\u03c5\u03c1\u0442\u03b1\u0442\u0454 \u03bd\u0454\u0142\u03b9\u0442 \u0454\u0455\u0455\u0454 \u00a2\u03b9\u0142\u0142\u03c5\u043c \u2202\u03c3\u0142\u03c3\u044f\u0454 \u0454\u03c5 \u0192\u03c5g\u03b9\u03b1\u0442 \u03b7\u03c5\u0142\u0142\u03b1 \u03c1\u03b1\u044f\u03b9\u03b1\u0442\u03c5\u044f. \u0454\u03c7\u00a2\u0454\u03c1\u0442\u0454\u03c5\u044f \u0455\u03b9\u03b7\u0442 \u03c3\u00a2\u00a2\u03b1\u0454\u00a2\u03b1\u0442 \u00a2\u03c5\u03c1\u03b9\u2202\u03b1\u0442\u03b1\u0442 \u03b7\u03c3\u03b7 \u03c1\u044f\u03c3\u03b9\u2202\u0454\u03b7\u0442, \u0455\u03c5\u03b7\u0442 \u03b9\u03b7 \u00a2\u03c5\u0142\u03c1\u03b1 q\u03c5\u03b9 \u03c3\u0192\u0192\u03b9\u00a2#",
-    "To share your certificate on Mozilla Backpack, you must first have a Backpack account. Complete the following steps to add your certificate to Backpack.": "T\u00f6 sh\u00e4r\u00e9 \u00fd\u00f6\u00fcr \u00e7\u00e9rt\u00eff\u00ef\u00e7\u00e4t\u00e9 \u00f6n M\u00f6z\u00efll\u00e4 B\u00e4\u00e7kp\u00e4\u00e7k, \u00fd\u00f6\u00fc m\u00fcst f\u00efrst h\u00e4v\u00e9 \u00e4 B\u00e4\u00e7kp\u00e4\u00e7k \u00e4\u00e7\u00e7\u00f6\u00fcnt. \u00c7\u00f6mpl\u00e9t\u00e9 th\u00e9 f\u00f6ll\u00f6w\u00efng st\u00e9ps t\u00f6 \u00e4dd \u00fd\u00f6\u00fcr \u00e7\u00e9rt\u00eff\u00ef\u00e7\u00e4t\u00e9 t\u00f6 B\u00e4\u00e7kp\u00e4\u00e7k. \u2c60'\u03c3\u044f\u0454\u043c \u03b9\u03c1\u0455\u03c5\u043c \u2202\u03c3\u0142\u03c3\u044f \u0455\u03b9\u0442 \u03b1\u043c\u0454\u0442, \u00a2\u03c3\u03b7\u0455\u0454\u00a2\u0442\u0454\u0442\u03c5\u044f \u03b1\u2202\u03b9\u03c1\u03b9\u0455\u03b9\u00a2\u03b9\u03b7g \u0454\u0142\u03b9\u0442, \u0455\u0454\u2202 \u2202\u03c3 \u0454\u03b9\u03c5\u0455\u043c\u03c3\u2202 \u0442\u0454\u043c\u03c1\u03c3\u044f \u03b9\u03b7\u00a2\u03b9\u2202\u03b9\u2202\u03c5\u03b7\u0442 \u03c5\u0442 \u0142\u03b1\u0432\u03c3\u044f\u0454 \u0454\u0442 \u2202\u03c3\u0142\u03c3\u044f\u0454 \u043c\u03b1g\u03b7\u03b1 \u03b1\u0142\u03b9q\u03c5\u03b1. \u03c5\u0442 \u0454\u03b7\u03b9\u043c \u03b1\u2202 \u043c\u03b9\u03b7\u03b9\u043c \u03bd\u0454\u03b7\u03b9\u03b1\u043c, q\u03c5\u03b9\u0455 \u03b7\u03c3\u0455\u0442\u044f\u03c5\u2202 \u0454\u03c7\u0454\u044f\u00a2\u03b9\u0442\u03b1\u0442\u03b9\u03c3\u03b7 \u03c5\u0142\u0142\u03b1\u043c\u00a2\u03c3 \u0142\u03b1\u0432\u03c3\u044f\u03b9\u0455 \u03b7\u03b9\u0455\u03b9 \u03c5\u0442 \u03b1\u0142\u03b9q\u03c5\u03b9\u03c1 \u0454\u03c7 \u0454\u03b1 \u00a2\u03c3\u043c\u043c\u03c3\u2202\u03c3 \u00a2\u03c3\u03b7\u0455\u0454q\u03c5\u03b1\u0442. \u2202\u03c5\u03b9\u0455 \u03b1\u03c5\u0442\u0454 \u03b9\u044f\u03c5\u044f\u0454 \u2202\u03c3\u0142\u03c3\u044f \u03b9\u03b7 \u044f\u0454\u03c1\u044f\u0454\u043d\u0454\u03b7\u2202\u0454\u044f\u03b9\u0442 \u03b9\u03b7 \u03bd\u03c3\u0142\u03c5\u03c1\u0442\u03b1\u0442\u0454 \u03bd\u0454\u0142\u03b9\u0442 \u0454\u0455\u0455\u0454 \u00a2\u03b9\u0142\u0142\u03c5\u043c \u2202\u03c3\u0142\u03c3\u044f\u0454 \u0454\u03c5 \u0192\u03c5g\u03b9\u03b1\u0442 \u03b7\u03c5\u0142\u0142\u03b1 \u03c1\u03b1\u044f\u03b9\u03b1\u0442\u03c5\u044f. \u0454\u03c7\u00a2\u0454\u03c1\u0442\u0454\u03c5\u044f \u0455\u03b9\u03b7\u0442 \u03c3\u00a2\u00a2\u03b1\u0454\u00a2\u03b1\u0442 \u00a2\u03c5\u03c1\u03b9\u2202\u03b1\u0442\u03b1\u0442 \u03b7\u03c3\u03b7 \u03c1\u044f\u03c3\u03b9\u2202\u0454\u03b7\u0442, \u0455\u03c5\u03b7\u0442 \u03b9\u03b7 \u00a2\u03c5\u0142\u03c1\u03b1 q\u03c5\u03b9 \u03c3\u0192\u0192\u03b9\u00a2\u03b9\u03b1 \u2202\u0454\u0455\u0454\u044f\u03c5\u03b7\u0442 \u043c\u03c3\u0142\u0142\u03b9\u0442#",
     "To take a successful photo, make sure that:": "T\u00f6 t\u00e4k\u00e9 \u00e4 s\u00fc\u00e7\u00e7\u00e9ssf\u00fcl ph\u00f6t\u00f6, m\u00e4k\u00e9 s\u00fcr\u00e9 th\u00e4t: \u2c60'\u03c3\u044f\u0454\u043c \u03b9\u03c1\u0455\u03c5\u043c \u2202\u03c3\u0142\u03c3\u044f \u0455\u03b9\u0442 \u03b1\u043c\u0454\u0442, \u00a2\u03c3\u03b7\u0455\u0454\u00a2\u0442\u0454\u0442\u03c5\u044f #",
     "To take the photo of your face, click on the camera button {icon}. If you need to try again, click 'Retake Photo'.": "T\u00f6 t\u00e4k\u00e9 th\u00e9 ph\u00f6t\u00f6 \u00f6f \u00fd\u00f6\u00fcr f\u00e4\u00e7\u00e9, \u00e7l\u00ef\u00e7k \u00f6n th\u00e9 \u00e7\u00e4m\u00e9r\u00e4 \u00df\u00fctt\u00f6n {icon}. \u00ccf \u00fd\u00f6\u00fc n\u00e9\u00e9d t\u00f6 tr\u00fd \u00e4g\u00e4\u00efn, \u00e7l\u00ef\u00e7k 'R\u00e9t\u00e4k\u00e9 Ph\u00f6t\u00f6'. \u2c60'\u03c3\u044f\u0454\u043c \u03b9\u03c1\u0455\u03c5\u043c \u2202\u03c3\u0142\u03c3\u044f #",
     "To verify your identity, you need a webcam and a government-issued photo ID.": "T\u00f6 v\u00e9r\u00eff\u00fd \u00fd\u00f6\u00fcr \u00efd\u00e9nt\u00eft\u00fd, \u00fd\u00f6\u00fc n\u00e9\u00e9d \u00e4 w\u00e9\u00df\u00e7\u00e4m \u00e4nd \u00e4 g\u00f6v\u00e9rnm\u00e9nt-\u00efss\u00fc\u00e9d ph\u00f6t\u00f6 \u00ccD. \u2c60'\u03c3\u044f\u0454\u043c \u03b9\u03c1\u0455\u03c5\u043c \u2202\u03c3\u0142\u03c3\u044f \u0455\u03b9\u0442 \u03b1\u043c\u0454\u0442, \u00a2\u03c3\u03b7\u0455\u0454\u00a2\u0442\u0454\u0442\u03c5#",
@@ -2216,7 +2206,6 @@
     "What if I have difficulty holding my ID in position relative to the camera?": "Wh\u00e4t \u00eff \u00cc h\u00e4v\u00e9 d\u00efff\u00ef\u00e7\u00fclt\u00fd h\u00f6ld\u00efng m\u00fd \u00ccD \u00efn p\u00f6s\u00eft\u00ef\u00f6n r\u00e9l\u00e4t\u00efv\u00e9 t\u00f6 th\u00e9 \u00e7\u00e4m\u00e9r\u00e4? \u2c60'\u03c3\u044f\u0454\u043c \u03b9\u03c1\u0455\u03c5\u043c \u2202\u03c3\u0142\u03c3\u044f \u0455\u03b9\u0442 \u03b1\u043c\u0454\u0442, \u00a2\u03c3\u03b7\u0455\u0454\u00a2\u0442\u0454\u0442\u03c5#",
     "What if I have difficulty holding my head in position relative to the camera?": "Wh\u00e4t \u00eff \u00cc h\u00e4v\u00e9 d\u00efff\u00ef\u00e7\u00fclt\u00fd h\u00f6ld\u00efng m\u00fd h\u00e9\u00e4d \u00efn p\u00f6s\u00eft\u00ef\u00f6n r\u00e9l\u00e4t\u00efv\u00e9 t\u00f6 th\u00e9 \u00e7\u00e4m\u00e9r\u00e4? \u2c60'\u03c3\u044f\u0454\u043c \u03b9\u03c1\u0455\u03c5\u043c \u2202\u03c3\u0142\u03c3\u044f \u0455\u03b9\u0442 \u03b1\u043c\u0454\u0442, \u00a2\u03c3\u03b7\u0455\u0454\u00a2\u0442\u0454\u0442#",
     "What was the total combined income, during the last 12 months, of all members of your family? ": "Wh\u00e4t w\u00e4s th\u00e9 t\u00f6t\u00e4l \u00e7\u00f6m\u00df\u00efn\u00e9d \u00efn\u00e7\u00f6m\u00e9, d\u00fcr\u00efng th\u00e9 l\u00e4st 12 m\u00f6nths, \u00f6f \u00e4ll m\u00e9m\u00df\u00e9rs \u00f6f \u00fd\u00f6\u00fcr f\u00e4m\u00efl\u00fd?  \u2c60'\u03c3\u044f\u0454\u043c \u03b9\u03c1\u0455\u03c5\u043c \u2202\u03c3\u0142\u03c3\u044f \u0455\u03b9\u0442 \u03b1\u043c\u0454\u0442, \u00a2#",
-    "What's Your Next Accomplishment?": "Wh\u00e4t's \u00dd\u00f6\u00fcr N\u00e9xt \u00c0\u00e7\u00e7\u00f6mpl\u00efshm\u00e9nt? \u2c60'\u03c3\u044f\u0454\u043c \u03b9\u03c1\u0455\u03c5\u043c \u2202\u03c3\u0142\u03c3\u044f \u0455\u03b9\u0442 \u03b1\u043c\u0454\u0442, \u00a2\u03c3\u03b7\u0455\u0454\u00a2\u0442\u0454#",
     "What's in my clipboard?": "Wh\u00e4t's \u00efn m\u00fd \u00e7l\u00efp\u00df\u00f6\u00e4rd? \u2c60'\u03c3\u044f\u0454\u043c \u03b9\u03c1\u0455\u03c5\u043c \u2202\u03c3\u0142\u03c3\u044f \u0455\u03b9\u0442 \u03b1\u043c\u0454\u0442, \u00a2\u03c3#",
     "When learners submit an answer to an assessment, they immediately see whether the answer is correct or incorrect, and the score received.": "Wh\u00e9n l\u00e9\u00e4rn\u00e9rs s\u00fc\u00dfm\u00eft \u00e4n \u00e4nsw\u00e9r t\u00f6 \u00e4n \u00e4ss\u00e9ssm\u00e9nt, th\u00e9\u00fd \u00efmm\u00e9d\u00ef\u00e4t\u00e9l\u00fd s\u00e9\u00e9 wh\u00e9th\u00e9r th\u00e9 \u00e4nsw\u00e9r \u00efs \u00e7\u00f6rr\u00e9\u00e7t \u00f6r \u00efn\u00e7\u00f6rr\u00e9\u00e7t, \u00e4nd th\u00e9 s\u00e7\u00f6r\u00e9 r\u00e9\u00e7\u00e9\u00efv\u00e9d. \u2c60'\u03c3\u044f\u0454\u043c \u03b9\u03c1\u0455\u03c5\u043c \u2202\u03c3\u0142\u03c3\u044f \u0455\u03b9\u0442 \u03b1\u043c\u0454\u0442, \u00a2\u03c3\u03b7\u0455\u0454\u00a2\u0442\u0454\u0442\u03c5\u044f \u03b1\u2202\u03b9\u03c1\u03b9\u0455\u03b9\u00a2\u03b9\u03b7g \u0454\u0142\u03b9\u0442, \u0455\u0454\u2202 \u2202\u03c3 \u0454\u03b9\u03c5\u0455\u043c\u03c3\u2202 \u0442\u0454\u043c\u03c1\u03c3\u044f \u03b9\u03b7\u00a2\u03b9\u2202\u03b9\u2202\u03c5\u03b7\u0442 \u03c5\u0442 \u0142\u03b1\u0432\u03c3\u044f\u0454 \u0454\u0442 \u2202\u03c3\u0142\u03c3\u044f\u0454 \u043c\u03b1g\u03b7\u03b1 \u03b1\u0142\u03b9q\u03c5\u03b1. \u03c5\u0442 \u0454\u03b7\u03b9\u043c \u03b1\u2202 \u043c\u03b9\u03b7\u03b9\u043c \u03bd\u0454\u03b7\u03b9\u03b1\u043c, q\u03c5\u03b9\u0455 \u03b7\u03c3\u0455\u0442\u044f\u03c5\u2202 \u0454\u03c7\u0454\u044f\u00a2\u03b9\u0442\u03b1\u0442\u03b9\u03c3\u03b7 \u03c5\u0142\u0142\u03b1\u043c\u00a2\u03c3 \u0142\u03b1\u0432\u03c3\u044f\u03b9\u0455 \u03b7\u03b9\u0455\u03b9 \u03c5\u0442 \u03b1\u0142\u03b9q\u03c5\u03b9\u03c1 \u0454\u03c7 \u0454\u03b1 \u00a2\u03c3\u043c\u043c\u03c3\u2202\u03c3 \u00a2\u03c3\u03b7\u0455\u0454q\u03c5\u03b1\u0442. \u2202\u03c5\u03b9\u0455 \u03b1\u03c5\u0442\u0454 \u03b9\u044f\u03c5\u044f\u0454 \u2202\u03c3\u0142\u03c3\u044f \u03b9\u03b7 \u044f\u0454\u03c1\u044f\u0454\u043d\u0454\u03b7\u2202\u0454\u044f\u03b9\u0442 \u03b9\u03b7 \u03bd\u03c3\u0142\u03c5\u03c1\u0442\u03b1\u0442\u0454 \u03bd\u0454\u0142\u03b9\u0442 \u0454\u0455\u0455\u0454 \u00a2\u03b9\u0142\u0142\u03c5\u043c \u2202\u03c3\u0142\u03c3\u044f\u0454 \u0454\u03c5 \u0192\u03c5g\u03b9\u03b1\u0442 \u03b7\u03c5\u0142\u0142\u03b1 \u03c1\u03b1\u044f\u03b9\u03b1\u0442\u03c5\u044f. \u0454\u03c7\u00a2\u0454\u03c1\u0442\u0454\u03c5\u044f \u0455\u03b9\u03b7\u0442 \u03c3\u00a2\u00a2\u03b1\u0454\u00a2\u03b1\u0442 \u00a2\u03c5\u03c1\u03b9\u2202\u03b1\u0442\u03b1\u0442 \u03b7\u03c3\u03b7 \u03c1\u044f\u03c3\u03b9\u2202\u0454\u03b7\u0442, \u0455\u03c5\u03b7\u0442 \u03b9\u03b7 \u00a2\u03c5\u0142\u03c1\u03b1 q\u03c5\u03b9 \u03c3\u0192\u0192\u03b9\u00a2\u03b9\u03b1 \u2202\u0454\u0455\u0454\u044f\u03c5\u03b7\u0442 \u043c\u03c3\u0142\u0142\u03b9\u0442 \u03b1\u03b7\u03b9\u043c \u03b9\u2202 \u0454\u0455\u0442 \u0142\u03b1\u0432\u03c3#",
     "When your face is in position, use the Take Photo button {icon} below to take your photo.": "Wh\u00e9n \u00fd\u00f6\u00fcr f\u00e4\u00e7\u00e9 \u00efs \u00efn p\u00f6s\u00eft\u00ef\u00f6n, \u00fcs\u00e9 th\u00e9 T\u00e4k\u00e9 Ph\u00f6t\u00f6 \u00df\u00fctt\u00f6n {icon} \u00df\u00e9l\u00f6w t\u00f6 t\u00e4k\u00e9 \u00fd\u00f6\u00fcr ph\u00f6t\u00f6. \u2c60'\u03c3\u044f\u0454\u043c \u03b9\u03c1\u0455\u03c5\u043c \u2202\u03c3\u0142\u03c3\u044f \u0455\u03b9\u0442 \u03b1\u043c\u0454\u0442, \u00a2\u03c3\u03b7\u0455\u0454\u00a2#",
@@ -2497,7 +2486,6 @@
     "{categoryText} in {parentDisplayname}": "{categoryText} \u00efn {parentDisplayname} \u2c60'\u03c3\u044f\u0454\u043c \u03b9\u03c1\u0455\u03c5\u043c \u2202\u03c3\u0142\u03c3#",
     "{currentCountOpeningTag}{currentCharacterCount}{currentCountClosingTag} of {maxCharacters}": "{currentCountOpeningTag}{currentCharacterCount}{currentCountClosingTag} \u00f6f {maxCharacters} \u2c60'\u03c3\u044f\u0454\u043c \u03b9\u03c1\u0455\u03c5\u043c \u2202\u03c3\u0142\u03c3\u044f \u0455\u03b9\u0442 \u03b1\u043c#",
     "{display_name} Settings": "{display_name} S\u00e9tt\u00efngs \u2c60'\u03c3\u044f\u0454\u043c \u03b9\u03c1\u0455\u03c5\u043c \u2202\u03c3\u0142\u03c3\u044f \u0455#",
-    "{download_link_start}Download this image (right-click or option-click, save as){link_end} and then {upload_link_start}upload{link_end} it to your backpack.": "{download_link_start}D\u00f6wnl\u00f6\u00e4d th\u00efs \u00efm\u00e4g\u00e9 (r\u00efght-\u00e7l\u00ef\u00e7k \u00f6r \u00f6pt\u00ef\u00f6n-\u00e7l\u00ef\u00e7k, s\u00e4v\u00e9 \u00e4s){link_end} \u00e4nd th\u00e9n {upload_link_start}\u00fcpl\u00f6\u00e4d{link_end} \u00eft t\u00f6 \u00fd\u00f6\u00fcr \u00df\u00e4\u00e7kp\u00e4\u00e7k. \u2c60'\u03c3\u044f\u0454\u043c \u03b9\u03c1\u0455\u03c5\u043c \u2202\u03c3\u0142\u03c3\u044f \u0455\u03b9\u0442#",
     "{earned}/{possible} point (graded)": [
       "{earned}/{possible} p\u00f6\u00efnt (gr\u00e4d\u00e9d) \u2c60'\u03c3\u044f\u0454\u043c \u03b9\u03c1\u0455\u03c5\u043c \u2202\u03c3\u0142\u03c3\u044f \u0455\u03b9\u0442 \u03b1\u043c\u0454\u0442, \u00a2#",
       "{earned}/{possible} p\u00f6\u00efnts (gr\u00e4d\u00e9d) \u2c60'\u03c3\u044f\u0454\u043c \u03b9\u03c1\u0455\u03c5\u043c \u2202\u03c3\u0142\u03c3\u044f \u0455\u03b9\u0442 \u03b1\u043c\u0454\u0442, \u00a2\u03c3#"
diff --git a/lms/static/js/i18n/rtl/djangojs.js b/lms/static/js/i18n/rtl/djangojs.js
index 6917e187da01..b94b5774debc 100644
--- a/lms/static/js/i18n/rtl/djangojs.js
+++ b/lms/static/js/i18n/rtl/djangojs.js
@@ -125,8 +125,6 @@
     "Access to some content in this {blockType} is restricted to specific groups of learners.": "\u023a\u0254\u0254\u01ddss \u0287\u00f8 s\u00f8\u026f\u01dd \u0254\u00f8n\u0287\u01ddn\u0287 \u1d09n \u0287\u0265\u1d09s {blockType} \u1d09s \u0279\u01dds\u0287\u0279\u1d09\u0254\u0287\u01ddd \u0287\u00f8 sd\u01dd\u0254\u1d09\u025f\u1d09\u0254 \u0183\u0279\u00f8nds \u00f8\u025f l\u01dd\u0250\u0279n\u01dd\u0279s.",
     "Access to this unit is restricted to: {selectedGroupsLabel}": "\u023a\u0254\u0254\u01ddss \u0287\u00f8 \u0287\u0265\u1d09s nn\u1d09\u0287 \u1d09s \u0279\u01dds\u0287\u0279\u1d09\u0254\u0287\u01ddd \u0287\u00f8: {selectedGroupsLabel}",
     "Access to this {blockType} is restricted to: {selectedGroupsLabel}": "\u023a\u0254\u0254\u01ddss \u0287\u00f8 \u0287\u0265\u1d09s {blockType} \u1d09s \u0279\u01dds\u0287\u0279\u1d09\u0254\u0287\u01ddd \u0287\u00f8: {selectedGroupsLabel}",
-    "Accomplishments": "\u023a\u0254\u0254\u00f8\u026fdl\u1d09s\u0265\u026f\u01ddn\u0287s",
-    "Accomplishments Pagination": "\u023a\u0254\u0254\u00f8\u026fdl\u1d09s\u0265\u026f\u01ddn\u0287s \u2c63\u0250\u0183\u1d09n\u0250\u0287\u1d09\u00f8n",
     "According to our records, you are not enrolled in any courses included in your {programName} program subscription. Enroll in a course from the {i_start}Program Details{i_end} page.": "\u023a\u0254\u0254\u00f8\u0279d\u1d09n\u0183 \u0287\u00f8 \u00f8n\u0279 \u0279\u01dd\u0254\u00f8\u0279ds, \u028e\u00f8n \u0250\u0279\u01dd n\u00f8\u0287 \u01ddn\u0279\u00f8ll\u01ddd \u1d09n \u0250n\u028e \u0254\u00f8n\u0279s\u01dds \u1d09n\u0254lnd\u01ddd \u1d09n \u028e\u00f8n\u0279 {programName} d\u0279\u00f8\u0183\u0279\u0250\u026f snbs\u0254\u0279\u1d09d\u0287\u1d09\u00f8n. \u0246n\u0279\u00f8ll \u1d09n \u0250 \u0254\u00f8n\u0279s\u01dd \u025f\u0279\u00f8\u026f \u0287\u0265\u01dd {i_start}\u2c63\u0279\u00f8\u0183\u0279\u0250\u026f \u0110\u01dd\u0287\u0250\u1d09ls{i_end} d\u0250\u0183\u01dd.",
     "Account": "\u023a\u0254\u0254\u00f8nn\u0287",
     "Account Information": "\u023a\u0254\u0254\u00f8nn\u0287 \u0197n\u025f\u00f8\u0279\u026f\u0250\u0287\u1d09\u00f8n",
@@ -500,7 +498,6 @@
     "Create a content group": "\u023b\u0279\u01dd\u0250\u0287\u01dd \u0250 \u0254\u00f8n\u0287\u01ddn\u0287 \u0183\u0279\u00f8nd",
     "Create a new team if you can't find an existing team to join, or if you would like to learn with friends you know.": "\u023b\u0279\u01dd\u0250\u0287\u01dd \u0250 n\u01dd\u028d \u0287\u01dd\u0250\u026f \u1d09\u025f \u028e\u00f8n \u0254\u0250n'\u0287 \u025f\u1d09nd \u0250n \u01ddx\u1d09s\u0287\u1d09n\u0183 \u0287\u01dd\u0250\u026f \u0287\u00f8 \u027e\u00f8\u1d09n, \u00f8\u0279 \u1d09\u025f \u028e\u00f8n \u028d\u00f8nld l\u1d09\u029e\u01dd \u0287\u00f8 l\u01dd\u0250\u0279n \u028d\u1d09\u0287\u0265 \u025f\u0279\u1d09\u01ddnds \u028e\u00f8n \u029en\u00f8\u028d.",
     "Create a report of problem responses": "\u023b\u0279\u01dd\u0250\u0287\u01dd \u0250 \u0279\u01ddd\u00f8\u0279\u0287 \u00f8\u025f d\u0279\u00f8bl\u01dd\u026f \u0279\u01ddsd\u00f8ns\u01dds",
-    "Create a {link_start}Mozilla Backpack{link_end} account, or log in to your existing account": "\u023b\u0279\u01dd\u0250\u0287\u01dd \u0250 {link_start}M\u00f8z\u1d09ll\u0250 \u0243\u0250\u0254\u029ed\u0250\u0254\u029e{link_end} \u0250\u0254\u0254\u00f8nn\u0287, \u00f8\u0279 l\u00f8\u0183 \u1d09n \u0287\u00f8 \u028e\u00f8n\u0279 \u01ddx\u1d09s\u0287\u1d09n\u0183 \u0250\u0254\u0254\u00f8nn\u0287",
     "Create account using %(providerName)s.": "\u023b\u0279\u01dd\u0250\u0287\u01dd \u0250\u0254\u0254\u00f8nn\u0287 ns\u1d09n\u0183 %(providerName)s.",
     "Create an Account": "\u023b\u0279\u01dd\u0250\u0287\u01dd \u0250n \u023a\u0254\u0254\u00f8nn\u0287",
     "Create an Account.": "\u023b\u0279\u01dd\u0250\u0287\u01dd \u0250n \u023a\u0254\u0254\u00f8nn\u0287.",
@@ -604,7 +601,6 @@
     "Duplicate": "\u0110ndl\u1d09\u0254\u0250\u0287\u01dd",
     "Duplicating": "\u0110ndl\u1d09\u0254\u0250\u0287\u1d09n\u0183",
     "Duration (sec)": "\u0110n\u0279\u0250\u0287\u1d09\u00f8n (s\u01dd\u0254)",
-    "Earned %(created)s.": "\u0246\u0250\u0279n\u01ddd %(created)s.",
     "Earned Certificates": "\u0246\u0250\u0279n\u01ddd \u023b\u01dd\u0279\u0287\u1d09\u025f\u1d09\u0254\u0250\u0287\u01dds",
     "EdX doesn't have a timed transcript for this video in Studio, but we found a transcript on YouTube. You can import the YouTube transcript or upload your own .srt transcript file.": "\u0246dX d\u00f8\u01ddsn'\u0287 \u0265\u0250\u028c\u01dd \u0250 \u0287\u1d09\u026f\u01ddd \u0287\u0279\u0250ns\u0254\u0279\u1d09d\u0287 \u025f\u00f8\u0279 \u0287\u0265\u1d09s \u028c\u1d09d\u01dd\u00f8 \u1d09n S\u0287nd\u1d09\u00f8, bn\u0287 \u028d\u01dd \u025f\u00f8nnd \u0250 \u0287\u0279\u0250ns\u0254\u0279\u1d09d\u0287 \u00f8n \u024e\u00f8n\u0166nb\u01dd. \u024e\u00f8n \u0254\u0250n \u1d09\u026fd\u00f8\u0279\u0287 \u0287\u0265\u01dd \u024e\u00f8n\u0166nb\u01dd \u0287\u0279\u0250ns\u0254\u0279\u1d09d\u0287 \u00f8\u0279 ndl\u00f8\u0250d \u028e\u00f8n\u0279 \u00f8\u028dn .s\u0279\u0287 \u0287\u0279\u0250ns\u0254\u0279\u1d09d\u0287 \u025f\u1d09l\u01dd.",
     "EdX doesn\\'t have a timed transcript for this video. Please upload an .srt file.": "\u0246dX d\u00f8\u01ddsn\\'\u0287 \u0265\u0250\u028c\u01dd \u0250 \u0287\u1d09\u026f\u01ddd \u0287\u0279\u0250ns\u0254\u0279\u1d09d\u0287 \u025f\u00f8\u0279 \u0287\u0265\u1d09s \u028c\u1d09d\u01dd\u00f8. \u2c63l\u01dd\u0250s\u01dd ndl\u00f8\u0250d \u0250n .s\u0279\u0287 \u025f\u1d09l\u01dd.",
@@ -761,7 +757,6 @@
     "Financial Assistance": "F\u1d09n\u0250n\u0254\u1d09\u0250l \u023ass\u1d09s\u0287\u0250n\u0254\u01dd",
     "Financial Assistance Application": "F\u1d09n\u0250n\u0254\u1d09\u0250l \u023ass\u1d09s\u0287\u0250n\u0254\u01dd \u023addl\u1d09\u0254\u0250\u0287\u1d09\u00f8n",
     "Find": "F\u1d09nd",
-    "Find a course": "F\u1d09nd \u0250 \u0254\u00f8n\u0279s\u01dd",
     "Find and replace": "F\u1d09nd \u0250nd \u0279\u01dddl\u0250\u0254\u01dd",
     "Find answers to the top questions asked by learners.": "F\u1d09nd \u0250ns\u028d\u01dd\u0279s \u0287\u00f8 \u0287\u0265\u01dd \u0287\u00f8d bn\u01dds\u0287\u1d09\u00f8ns \u0250s\u029e\u01ddd b\u028e l\u01dd\u0250\u0279n\u01dd\u0279s.",
     "Find discussions": "F\u1d09nd d\u1d09s\u0254nss\u1d09\u00f8ns",
@@ -1449,10 +1444,7 @@
     "Set up your certificate": "S\u01dd\u0287 nd \u028e\u00f8n\u0279 \u0254\u01dd\u0279\u0287\u1d09\u025f\u1d09\u0254\u0250\u0287\u01dd",
     "Settings": "S\u01dd\u0287\u0287\u1d09n\u0183s",
     "Settings updated": "S\u01dd\u0287\u0287\u1d09n\u0183s ndd\u0250\u0287\u01ddd",
-    "Share": "S\u0265\u0250\u0279\u01dd",
     "Share Alike": "S\u0265\u0250\u0279\u01dd \u023al\u1d09\u029e\u01dd",
-    "Share on Mozilla Backpack": "S\u0265\u0250\u0279\u01dd \u00f8n M\u00f8z\u1d09ll\u0250 \u0243\u0250\u0254\u029ed\u0250\u0254\u029e",
-    "Share your \"%(display_name)s\" award": "S\u0265\u0250\u0279\u01dd \u028e\u00f8n\u0279 \"%(display_name)s\" \u0250\u028d\u0250\u0279d",
     "Short explanation": "S\u0265\u00f8\u0279\u0287 \u01ddxdl\u0250n\u0250\u0287\u1d09\u00f8n",
     "Show All": "S\u0265\u00f8\u028d \u023all",
     "Show Annotations": "S\u0265\u00f8\u028d \u023ann\u00f8\u0287\u0250\u0287\u1d09\u00f8ns",
@@ -1532,7 +1524,6 @@
     "Start of transcript. Skip to the end.": "S\u0287\u0250\u0279\u0287 \u00f8\u025f \u0287\u0279\u0250ns\u0254\u0279\u1d09d\u0287. S\u029e\u1d09d \u0287\u00f8 \u0287\u0265\u01dd \u01ddnd.",
     "Start regenerating certificates for students in this course?": "S\u0287\u0250\u0279\u0287 \u0279\u01dd\u0183\u01ddn\u01dd\u0279\u0250\u0287\u1d09n\u0183 \u0254\u01dd\u0279\u0287\u1d09\u025f\u1d09\u0254\u0250\u0287\u01dds \u025f\u00f8\u0279 s\u0287nd\u01ddn\u0287s \u1d09n \u0287\u0265\u1d09s \u0254\u00f8n\u0279s\u01dd?",
     "Start search": "S\u0287\u0250\u0279\u0287 s\u01dd\u0250\u0279\u0254\u0265",
-    "Start working toward your next learning goal.": "S\u0287\u0250\u0279\u0287 \u028d\u00f8\u0279\u029e\u1d09n\u0183 \u0287\u00f8\u028d\u0250\u0279d \u028e\u00f8n\u0279 n\u01ddx\u0287 l\u01dd\u0250\u0279n\u1d09n\u0183 \u0183\u00f8\u0250l.",
     "Start {trialLength}-day free trial": "S\u0287\u0250\u0279\u0287 {trialLength}-d\u0250\u028e \u025f\u0279\u01dd\u01dd \u0287\u0279\u1d09\u0250l",
     "Started entrance exam rescore task for student '{student_id}'. Click the 'Show Task Status' button to see the status of the task.": "S\u0287\u0250\u0279\u0287\u01ddd \u01ddn\u0287\u0279\u0250n\u0254\u01dd \u01ddx\u0250\u026f \u0279\u01dds\u0254\u00f8\u0279\u01dd \u0287\u0250s\u029e \u025f\u00f8\u0279 s\u0287nd\u01ddn\u0287 '{student_id}'. \u023bl\u1d09\u0254\u029e \u0287\u0265\u01dd 'S\u0265\u00f8\u028d \u0166\u0250s\u029e S\u0287\u0250\u0287ns' bn\u0287\u0287\u00f8n \u0287\u00f8 s\u01dd\u01dd \u0287\u0265\u01dd s\u0287\u0250\u0287ns \u00f8\u025f \u0287\u0265\u01dd \u0287\u0250s\u029e.",
     "Started rescore problem task for problem '<%- problem_id %>' and student '<%- student_id %>'. Click the 'Show Task Status' button to see the status of the task.": "S\u0287\u0250\u0279\u0287\u01ddd \u0279\u01dds\u0254\u00f8\u0279\u01dd d\u0279\u00f8bl\u01dd\u026f \u0287\u0250s\u029e \u025f\u00f8\u0279 d\u0279\u00f8bl\u01dd\u026f '<%- problem_id %>' \u0250nd s\u0287nd\u01ddn\u0287 '<%- student_id %>'. \u023bl\u1d09\u0254\u029e \u0287\u0265\u01dd 'S\u0265\u00f8\u028d \u0166\u0250s\u029e S\u0287\u0250\u0287ns' bn\u0287\u0287\u00f8n \u0287\u00f8 s\u01dd\u01dd \u0287\u0265\u01dd s\u0287\u0250\u0287ns \u00f8\u025f \u0287\u0265\u01dd \u0287\u0250s\u029e.",
@@ -1820,7 +1811,6 @@
     "To receive a certificate, you must also verify your identity.": "\u0166\u00f8 \u0279\u01dd\u0254\u01dd\u1d09\u028c\u01dd \u0250 \u0254\u01dd\u0279\u0287\u1d09\u025f\u1d09\u0254\u0250\u0287\u01dd, \u028e\u00f8n \u026fns\u0287 \u0250ls\u00f8 \u028c\u01dd\u0279\u1d09\u025f\u028e \u028e\u00f8n\u0279 \u1d09d\u01ddn\u0287\u1d09\u0287\u028e.",
     "To receive credit for problems, you must select \"Submit\" for each problem before you select \"End My Exam\".": "\u0166\u00f8 \u0279\u01dd\u0254\u01dd\u1d09\u028c\u01dd \u0254\u0279\u01ddd\u1d09\u0287 \u025f\u00f8\u0279 d\u0279\u00f8bl\u01dd\u026fs, \u028e\u00f8n \u026fns\u0287 s\u01ddl\u01dd\u0254\u0287 \"Snb\u026f\u1d09\u0287\" \u025f\u00f8\u0279 \u01dd\u0250\u0254\u0265 d\u0279\u00f8bl\u01dd\u026f b\u01dd\u025f\u00f8\u0279\u01dd \u028e\u00f8n s\u01ddl\u01dd\u0254\u0287 \"\u0246nd M\u028e \u0246x\u0250\u026f\".",
     "To review learner cohort assignments or see the results of uploading a CSV file, download course profile information or cohort results on the {link_start}Data Download{link_end} page.": "\u0166\u00f8 \u0279\u01dd\u028c\u1d09\u01dd\u028d l\u01dd\u0250\u0279n\u01dd\u0279 \u0254\u00f8\u0265\u00f8\u0279\u0287 \u0250ss\u1d09\u0183n\u026f\u01ddn\u0287s \u00f8\u0279 s\u01dd\u01dd \u0287\u0265\u01dd \u0279\u01ddsnl\u0287s \u00f8\u025f ndl\u00f8\u0250d\u1d09n\u0183 \u0250 \u023bSV \u025f\u1d09l\u01dd, d\u00f8\u028dnl\u00f8\u0250d \u0254\u00f8n\u0279s\u01dd d\u0279\u00f8\u025f\u1d09l\u01dd \u1d09n\u025f\u00f8\u0279\u026f\u0250\u0287\u1d09\u00f8n \u00f8\u0279 \u0254\u00f8\u0265\u00f8\u0279\u0287 \u0279\u01ddsnl\u0287s \u00f8n \u0287\u0265\u01dd {link_start}\u0110\u0250\u0287\u0250 \u0110\u00f8\u028dnl\u00f8\u0250d{link_end} d\u0250\u0183\u01dd.",
-    "To share your certificate on Mozilla Backpack, you must first have a Backpack account. Complete the following steps to add your certificate to Backpack.": "\u0166\u00f8 s\u0265\u0250\u0279\u01dd \u028e\u00f8n\u0279 \u0254\u01dd\u0279\u0287\u1d09\u025f\u1d09\u0254\u0250\u0287\u01dd \u00f8n M\u00f8z\u1d09ll\u0250 \u0243\u0250\u0254\u029ed\u0250\u0254\u029e, \u028e\u00f8n \u026fns\u0287 \u025f\u1d09\u0279s\u0287 \u0265\u0250\u028c\u01dd \u0250 \u0243\u0250\u0254\u029ed\u0250\u0254\u029e \u0250\u0254\u0254\u00f8nn\u0287. \u023b\u00f8\u026fdl\u01dd\u0287\u01dd \u0287\u0265\u01dd \u025f\u00f8ll\u00f8\u028d\u1d09n\u0183 s\u0287\u01ddds \u0287\u00f8 \u0250dd \u028e\u00f8n\u0279 \u0254\u01dd\u0279\u0287\u1d09\u025f\u1d09\u0254\u0250\u0287\u01dd \u0287\u00f8 \u0243\u0250\u0254\u029ed\u0250\u0254\u029e.",
     "To take a successful photo, make sure that:": "\u0166\u00f8 \u0287\u0250\u029e\u01dd \u0250 sn\u0254\u0254\u01ddss\u025fnl d\u0265\u00f8\u0287\u00f8, \u026f\u0250\u029e\u01dd sn\u0279\u01dd \u0287\u0265\u0250\u0287:",
     "To take the photo of your face, click on the camera button {icon}. If you need to try again, click 'Retake Photo'.": "\u0166\u00f8 \u0287\u0250\u029e\u01dd \u0287\u0265\u01dd d\u0265\u00f8\u0287\u00f8 \u00f8\u025f \u028e\u00f8n\u0279 \u025f\u0250\u0254\u01dd, \u0254l\u1d09\u0254\u029e \u00f8n \u0287\u0265\u01dd \u0254\u0250\u026f\u01dd\u0279\u0250 bn\u0287\u0287\u00f8n {icon}. \u0197\u025f \u028e\u00f8n n\u01dd\u01ddd \u0287\u00f8 \u0287\u0279\u028e \u0250\u0183\u0250\u1d09n, \u0254l\u1d09\u0254\u029e '\u024c\u01dd\u0287\u0250\u029e\u01dd \u2c63\u0265\u00f8\u0287\u00f8'.",
     "To verify your identity, you need a webcam and a government-issued photo ID.": "\u0166\u00f8 \u028c\u01dd\u0279\u1d09\u025f\u028e \u028e\u00f8n\u0279 \u1d09d\u01ddn\u0287\u1d09\u0287\u028e, \u028e\u00f8n n\u01dd\u01ddd \u0250 \u028d\u01ddb\u0254\u0250\u026f \u0250nd \u0250 \u0183\u00f8\u028c\u01dd\u0279n\u026f\u01ddn\u0287-\u1d09ssn\u01ddd d\u0265\u00f8\u0287\u00f8 \u0197\u0110.",
@@ -2046,7 +2036,6 @@
     "What if I have difficulty holding my ID in position relative to the camera?": "W\u0265\u0250\u0287 \u1d09\u025f \u0197 \u0265\u0250\u028c\u01dd d\u1d09\u025f\u025f\u1d09\u0254nl\u0287\u028e \u0265\u00f8ld\u1d09n\u0183 \u026f\u028e \u0197\u0110 \u1d09n d\u00f8s\u1d09\u0287\u1d09\u00f8n \u0279\u01ddl\u0250\u0287\u1d09\u028c\u01dd \u0287\u00f8 \u0287\u0265\u01dd \u0254\u0250\u026f\u01dd\u0279\u0250?",
     "What if I have difficulty holding my head in position relative to the camera?": "W\u0265\u0250\u0287 \u1d09\u025f \u0197 \u0265\u0250\u028c\u01dd d\u1d09\u025f\u025f\u1d09\u0254nl\u0287\u028e \u0265\u00f8ld\u1d09n\u0183 \u026f\u028e \u0265\u01dd\u0250d \u1d09n d\u00f8s\u1d09\u0287\u1d09\u00f8n \u0279\u01ddl\u0250\u0287\u1d09\u028c\u01dd \u0287\u00f8 \u0287\u0265\u01dd \u0254\u0250\u026f\u01dd\u0279\u0250?",
     "What was the total combined income, during the last 12 months, of all members of your family? ": "W\u0265\u0250\u0287 \u028d\u0250s \u0287\u0265\u01dd \u0287\u00f8\u0287\u0250l \u0254\u00f8\u026fb\u1d09n\u01ddd \u1d09n\u0254\u00f8\u026f\u01dd, dn\u0279\u1d09n\u0183 \u0287\u0265\u01dd l\u0250s\u0287 12 \u026f\u00f8n\u0287\u0265s, \u00f8\u025f \u0250ll \u026f\u01dd\u026fb\u01dd\u0279s \u00f8\u025f \u028e\u00f8n\u0279 \u025f\u0250\u026f\u1d09l\u028e? ",
-    "What's Your Next Accomplishment?": "W\u0265\u0250\u0287's \u024e\u00f8n\u0279 N\u01ddx\u0287 \u023a\u0254\u0254\u00f8\u026fdl\u1d09s\u0265\u026f\u01ddn\u0287?",
     "What's in my clipboard?": "W\u0265\u0250\u0287's \u1d09n \u026f\u028e \u0254l\u1d09db\u00f8\u0250\u0279d?",
     "When learners submit an answer to an assessment, they immediately see whether the answer is correct or incorrect, and the score received.": "W\u0265\u01ddn l\u01dd\u0250\u0279n\u01dd\u0279s snb\u026f\u1d09\u0287 \u0250n \u0250ns\u028d\u01dd\u0279 \u0287\u00f8 \u0250n \u0250ss\u01ddss\u026f\u01ddn\u0287, \u0287\u0265\u01dd\u028e \u1d09\u026f\u026f\u01ddd\u1d09\u0250\u0287\u01ddl\u028e s\u01dd\u01dd \u028d\u0265\u01dd\u0287\u0265\u01dd\u0279 \u0287\u0265\u01dd \u0250ns\u028d\u01dd\u0279 \u1d09s \u0254\u00f8\u0279\u0279\u01dd\u0254\u0287 \u00f8\u0279 \u1d09n\u0254\u00f8\u0279\u0279\u01dd\u0254\u0287, \u0250nd \u0287\u0265\u01dd s\u0254\u00f8\u0279\u01dd \u0279\u01dd\u0254\u01dd\u1d09\u028c\u01ddd.",
     "When your face is in position, use the Take Photo button {icon} below to take your photo.": "W\u0265\u01ddn \u028e\u00f8n\u0279 \u025f\u0250\u0254\u01dd \u1d09s \u1d09n d\u00f8s\u1d09\u0287\u1d09\u00f8n, ns\u01dd \u0287\u0265\u01dd \u0166\u0250\u029e\u01dd \u2c63\u0265\u00f8\u0287\u00f8 bn\u0287\u0287\u00f8n {icon} b\u01ddl\u00f8\u028d \u0287\u00f8 \u0287\u0250\u029e\u01dd \u028e\u00f8n\u0279 d\u0265\u00f8\u0287\u00f8.",
@@ -2301,7 +2290,6 @@
     "{categoryText} in {parentDisplayname}": "{categoryText} \u1d09n {parentDisplayname}",
     "{currentCountOpeningTag}{currentCharacterCount}{currentCountClosingTag} of {maxCharacters}": "{currentCountOpeningTag}{currentCharacterCount}{currentCountClosingTag} \u00f8\u025f {maxCharacters}",
     "{display_name} Settings": "{display_name} S\u01dd\u0287\u0287\u1d09n\u0183s",
-    "{download_link_start}Download this image (right-click or option-click, save as){link_end} and then {upload_link_start}upload{link_end} it to your backpack.": "{download_link_start}\u0110\u00f8\u028dnl\u00f8\u0250d \u0287\u0265\u1d09s \u1d09\u026f\u0250\u0183\u01dd (\u0279\u1d09\u0183\u0265\u0287-\u0254l\u1d09\u0254\u029e \u00f8\u0279 \u00f8d\u0287\u1d09\u00f8n-\u0254l\u1d09\u0254\u029e, s\u0250\u028c\u01dd \u0250s){link_end} \u0250nd \u0287\u0265\u01ddn {upload_link_start}ndl\u00f8\u0250d{link_end} \u1d09\u0287 \u0287\u00f8 \u028e\u00f8n\u0279 b\u0250\u0254\u029ed\u0250\u0254\u029e.",
     "{earned}/{possible} point (graded)": [
       "{earned}/{possible} d\u00f8\u1d09n\u0287 (\u0183\u0279\u0250d\u01ddd)",
       "{earned}/{possible} d\u00f8\u1d09n\u0287s (\u0183\u0279\u0250d\u01ddd)"
diff --git a/lms/static/js/learner_dashboard/spec/program_details_header_spec.js b/lms/static/js/learner_dashboard/spec/program_details_header_spec.js
index 398632ebb46a..d28d8f0bd3ee 100644
--- a/lms/static/js/learner_dashboard/spec/program_details_header_spec.js
+++ b/lms/static/js/learner_dashboard/spec/program_details_header_spec.js
@@ -81,7 +81,7 @@ describe('Program Details Header View', () => {
         expect(view.$('.org-logo').attr('alt'))
             .toEqual(`${context.programData.authoring_organizations[0].name}'s logo`);
     });
-
+    
     it('should render the subscription badge if subscription is active', () => {
         expect(view.$('.meta-info .badge').html().trim()).toEqual('Subscribed');
     });
diff --git a/lms/static/js/spec/student_account/helpers.js b/lms/static/js/spec/student_account/helpers.js
index 9215bd4edcfe..e1dd11425d12 100644
--- a/lms/static/js/spec/student_account/helpers.js
+++ b/lms/static/js/spec/student_account/helpers.js
@@ -3,7 +3,6 @@ define(['underscore'], function(_) {
 
     var USER_ACCOUNTS_API_URL = '/api/user/v0/accounts/student';
     var USER_PREFERENCES_API_URL = '/api/user/v0/preferences/student';
-    var BADGES_API_URL = '/api/badges/v1/assertions/user/student/';
     var IMAGE_UPLOAD_API_URL = '/api/profile_images/v0/staff/upload';
     var IMAGE_REMOVE_API_URL = '/api/profile_images/v0/staff/remove';
     var FIND_COURSES_URL = '/courses';
@@ -116,7 +115,6 @@ define(['underscore'], function(_) {
         social_links: [{platform: 'facebook', social_link: 'https://www.facebook.com/edX'}],
         language_proficiencies: [{code: '1'}],
         profile_image: PROFILE_IMAGE,
-        accomplishments_shared: false
     };
     var DEFAULT_USER_PREFERENCES_DATA = {
         'pref-lang': '2',
@@ -223,7 +221,6 @@ define(['underscore'], function(_) {
     return {
         USER_ACCOUNTS_API_URL: USER_ACCOUNTS_API_URL,
         USER_PREFERENCES_API_URL: USER_PREFERENCES_API_URL,
-        BADGES_API_URL: BADGES_API_URL,
         FIND_COURSES_URL: FIND_COURSES_URL,
         IMAGE_UPLOAD_API_URL: IMAGE_UPLOAD_API_URL,
         IMAGE_REMOVE_API_URL: IMAGE_REMOVE_API_URL,
diff --git a/lms/static/js/student_account/models/user_account_model.js b/lms/static/js/student_account/models/user_account_model.js
index d7ae96cc6cd0..2e3f9b034889 100644
--- a/lms/static/js/student_account/models/user_account_model.js
+++ b/lms/static/js/student_account/models/user_account_model.js
@@ -25,7 +25,6 @@
                 language_proficiencies: [],
                 requires_parental_consent: true,
                 profile_image: null,
-                accomplishments_shared: false,
                 default_public_account_fields: [],
                 extended_profile: [],
                 secondary_email: ''
diff --git a/lms/static/lms/js/spec/main.js b/lms/static/lms/js/spec/main.js
index 795782948f0b..cd8668ddc443 100644
--- a/lms/static/lms/js/spec/main.js
+++ b/lms/static/lms/js/spec/main.js
@@ -788,13 +788,9 @@
         'js/spec/views/message_banner_spec.js',
         'js/spec/views/notification_spec.js',
         'learner_profile/js/spec/learner_profile_factory_spec.js',
-        'learner_profile/js/spec/views/badge_list_container_spec.js',
-        'learner_profile/js/spec/views/badge_list_view_spec.js',
-        'learner_profile/js/spec/views/badge_view_spec.js',
         'learner_profile/js/spec/views/learner_profile_fields_spec.js',
         'learner_profile/js/spec/views/learner_profile_view_spec.js',
         'learner_profile/js/spec/views/section_two_tab_spec.js',
-        'learner_profile/js/spec/views/share_modal_view_spec.js',
         'support/js/spec/collections/enrollment_spec.js',
         'support/js/spec/models/enrollment_spec.js',
         'support/js/spec/views/certificates_spec.js',
diff --git a/lms/templates/index_overlay.html b/lms/templates/index_overlay.html
index 8a49adef323c..f5c455ac0718 100644
--- a/lms/templates/index_overlay.html
+++ b/lms/templates/index_overlay.html
@@ -6,5 +6,5 @@
 %>
 
 <h1>${Text(_(u"Welcome to {platform_name}")).format(platform_name=settings.PLATFORM_NAME)}</h1>
-## Translators: 'Open edX' is a registered trademark, please keep this untranslated. See https://open.edx.org for more information.
-<p>${Text(_("It works! Powered by Open edX{registered_trademark}")).format(registered_trademark=HTML("<sup style='font-size: 65%'>&reg;</sup>"))}</p>
+## Translators: 'Open edX' is a registered trademark, please keep this untranslated. See https://openedx.org for more information.
+<p>${Text(_("It works! Powered by the Open edX{registered_trademark} Platform")).format(registered_trademark=HTML("<sup style='font-size: 65%'>&reg;</sup>"))}</p>
diff --git a/lms/templates/lti_provider/user-auth-error.html b/lms/templates/lti_provider/user-auth-error.html
new file mode 100644
index 000000000000..a807e49f56b1
--- /dev/null
+++ b/lms/templates/lti_provider/user-auth-error.html
@@ -0,0 +1,32 @@
+<%page expression_filter="h" />
+<%namespace name='static' file='../static_content.html'/>
+<%!
+from django.utils.translation import gettext as _
+from openedx.core.djangolib.markup import HTML, Text
+%>
+<%inherit file="../main.html" />
+
+<section class="outside-app">
+  <h1>
+    ${Text(_("There was an error when loading this module!"))}
+  </h1>
+  <p>
+    ${Text(_("This module is available only for users who are signed into {platform}. "
+        "Kindly sign in and refresh this page to load the content."
+      )).format(
+        platform=HTML("<em>{}</em>").format(static.get_platform_name())
+      )}
+  </p>
+  <p class="my-3">
+    <strong>${_("NOTE:")}</strong>
+    ${Text(_(
+      "The email used to sign into this platform and {platform} should be the same."
+    )).format(
+      platform=HTML("<em>{}</em>").format(static.get_platform_name())
+    )}
+  </p>
+
+  <p class="mt-3">
+    <a class="btn btn-primary" href="${login_link}" target="_blank">${_("Sign in")}</a>
+  </p>
+</section>
diff --git a/lms/templates/problem.html b/lms/templates/problem.html
index 60d27b4ff5ad..3bf90b5daf44 100644
--- a/lms/templates/problem.html
+++ b/lms/templates/problem.html
@@ -40,7 +40,7 @@ <h3 class="hd hd-3 problem-header" id="${ short_id }-problem-title" aria-describ
           </button>
       </span>
       % endif
-      % if reset_button:
+      % if attempts_used and reset_button:
       <span class="problem-action-button-wrapper">
           <button type="button" class="reset problem-action-btn btn-link btn-small" data-value="${_('Reset')}"><span aria-hidden="true">${_('Reset')}</span><span class="sr">${_("Reset your answer")}</span></button>
       </span>
diff --git a/lms/templates/video.html b/lms/templates/video.html
index c3a9e08e0344..163a739930aa 100644
--- a/lms/templates/video.html
+++ b/lms/templates/video.html
@@ -48,110 +48,129 @@ <h4 class="hd hd-4 video-hls-error is-hidden">
 
     <div class="focus_grabber last"></div>
 
-    % if (download_video_link or track or handout or branding_info or public_sharing_enabled) and not hide_downloads:
-    <h3 class="hd hd-4 downloads-heading sr" id="video-download-transcripts_${id}">${_('Downloads and transcripts')}</h3>
-    <div class="wrapper-downloads" role="region" aria-labelledby="video-download-transcripts_${id}">
-        % if download_video_link or public_sharing_enabled:
-            <div class="wrapper-download-video">
-                <h4 class="hd hd-5">${_('Video')}</h4>
-                % if download_video_link:
-                    <span class="icon fa fa-download" aria-hidden="true"></span>
-                    <a class="btn-link video-sources video-download-button" href="${download_video_link}">
-                        ${_('Download video file')}
-                    </a>
-                % endif
-                % if download_video_link and public_sharing_enabled:
-                    <br>
-                % endif
-                % if sharing_sites_info:
-                    <div class="wrapper-social-share">
-                        <button
-                            style="background-image: none; background-color: rgb(0, 38, 43); border-radius: 0px; color: white" 
-                            class="social-toggle-btn btn"
-                        >
-                            <span class="icon fa fa-share-alt mr-2" style="text-shadow: none"></span>
-                            ${_('Share this video')}
-                        </button>
-                        <div
-                            hidden
-                            class="container-social-share color-black p-2"
-                            style="width: 300px; border-radius: 6px; background-color: white; box-shadow: 0 .5rem 1rem rgba(0,0,0,.15),0 .25rem .625rem rgba(0,0,0,.15)"
-                        >
-                            ${_('Share this video')}
-                            <div class="btn-link close-btn float-right">
-                                <span style="color: black" class="icon fa fa-close" />
-                            </div>
-
-                            <br />
-                            % for sharing_site_info in sharing_sites_info:
-                            <a
-                                class="btn-link social-share-link"
-                                data-source="${sharing_site_info['name']}"
-                                href="${sharing_site_info['sharing_url']}"
-                                target="_blank"
-                                rel="noopener noreferrer"
-                                style="font-size: 1.5rem"
+    <div class="wrapper-video-bottom-section">
+        % if ((download_video_link or track or handout or branding_info or public_sharing_enabled) and not hide_downloads):
+        <h3 class="hd hd-4 downloads-heading sr" id="video-download-transcripts_${id}">${_('Downloads and transcripts')}</h3>
+        <div class="wrapper-downloads" role="region" aria-labelledby="video-download-transcripts_${id}">
+            % if download_video_link or public_sharing_enabled:
+                <div class="wrapper-download-video">
+                    <h4 class="hd hd-5">${_('Video')}</h4>
+                    % if download_video_link:
+                        <span class="icon fa fa-download" aria-hidden="true"></span>
+                        <a class="btn-link video-sources video-download-button" href="${download_video_link}">
+                            ${_('Download video file')}
+                        </a>
+                    % endif
+                    % if download_video_link and public_sharing_enabled:
+                        <br>
+                    % endif
+                    % if sharing_sites_info:
+                        <div class="wrapper-social-share">
+                            <button
+                                style="background-image: none; background-color: rgb(0, 38, 43); border-radius: 0px; color: white"
+                                class="social-toggle-btn btn"
+                            >
+                                <span class="icon fa fa-share-alt mr-2" style="text-shadow: none"></span>
+                                ${_('Share this video')}
+                            </button>
+                            <div
+                                hidden
+                                class="container-social-share color-black p-2"
+                                style="width: 300px; border-radius: 6px; background-color: white; box-shadow: 0 .5rem 1rem rgba(0,0,0,.15),0 .25rem .625rem rgba(0,0,0,.15)"
                             >
-                                <span class="icon fa ${sharing_site_info['fa_icon_name']}" aria-hidden="true"></span>
-                                <span class="sr">${_("Share on {site}").format(site=sharing_site_info['name'])}</span>
-                            </a>
-                            % endfor
-                            <br />
-                            <div style="background-color: #F2F0EF" class="public-video-url-container p-2">
-                                <a href=${public_video_url} class="d-inline-block align-middle" style="width: 200px">
+                                ${_('Share this video')}
+                                <div class="btn-link close-btn float-right">
+                                    <span style="color: black" class="icon fa fa-close" />
+                                </div>
+    
+                                <br />
+                                % for sharing_site_info in sharing_sites_info:
+                                <a
+                                    class="btn-link social-share-link"
+                                    data-source="${sharing_site_info['name']}"
+                                    href="${sharing_site_info['sharing_url']}"
+                                    target="_blank"
+                                    rel="noopener noreferrer"
+                                    style="font-size: 1.5rem"
+                                >
+                                    <span class="icon fa ${sharing_site_info['fa_icon_name']}" aria-hidden="true"></span>
+                                    <span class="sr">${_("Share on {site}").format(site=sharing_site_info['name'])}</span>
+                                </a>
+                                % endfor
+                                <br />
+                                <div style="background-color: #F2F0EF" class="public-video-url-container p-2">
+                                    <a href=${public_video_url} class="d-inline-block align-middle" style="width: 200px">
+                                        <div
+                                            class="text-nowrap"
+                                            style="color: black; overflow: hidden; text-overflow: ellipsis; vertical-align: middle"
+                                        >
+                                            ${public_video_url}
+                                        </div>
+                                    </a>
                                     <div
-                                        class="text-nowrap"
-                                        style="color: black; overflow: hidden; text-overflow: ellipsis; vertical-align: middle"
+                                        class="public-video-copy-btn btn-link d-inline-block float-right"
+                                        data-url=${public_video_url}
                                     >
-                                        ${public_video_url}
+                                        <span class="icon fa fa-link pr-1"></span>
+                                        <span>${_('Copy')}</span>
                                     </div>
-                                </a>
-                                <div
-                                    class="public-video-copy-btn btn-link d-inline-block float-right"
-                                    data-url=${public_video_url}
-                                >
-                                    <span class="icon fa fa-link pr-1"></span>
-                                    <span>${_('Copy')}</span>
+                                  <span>
                                 </div>
-                              <span>
                             </div>
                         </div>
-                    </div>
+                    % endif
+                </div>
+            % endif
+            % if track:
+            <div class="wrapper-download-transcripts">
+                <h4 class="hd hd-5">${_('Transcripts')}</h4>
+                % if transcript_download_format:
+                <ul class="list-download-transcripts">
+                    % for item in transcript_download_formats_list:
+                        <li class="transcript-option">
+                            <span class="icon fa fa-download" aria-hidden="true"></span>
+                            <% dname = _("Download {file}").format(file=item['display_name']) %>
+                            <a class="btn btn-link" href="${track}" data-value="${item['value']}">${dname}</a>
+                        </li>
+                    % endfor
+                </ul>
+                % else:
+                <a class="btn-link external-track" href="${track}">${_('Download transcript')}</a>
                 % endif
             </div>
-        % endif
-        % if track:
-        <div class="wrapper-download-transcripts">
-            <h4 class="hd hd-5">${_('Transcripts')}</h4>
-            % if transcript_download_format:
-            <ul class="list-download-transcripts">
-                % for item in transcript_download_formats_list:
-                    <li class="transcript-option">
-                        <span class="icon fa fa-download" aria-hidden="true"></span>
-                        <% dname = _("Download {file}").format(file=item['display_name']) %>
-                        <a class="btn btn-link" href="${track}" data-value="${item['value']}">${dname}</a>
-                    </li>
-                % endfor
-            </ul>
-            % else:
-            <a class="btn-link external-track" href="${track}">${_('Download transcript')}</a>
+            % endif
+            % if handout:
+            <div class="wrapper-handouts">
+                <h4 class="hd hd-5">${_('Handouts')}</h4>
+                <a class="btn-link" href="${handout}">${_('Download Handout')}</a>
+            </div>
+            % endif
+            % if branding_info:
+            <div class="branding">
+                <span class="host-tag">${branding_info['logo_tag']}</span>
+                <a href="${branding_info['url']}"><img class="brand-logo" src="${branding_info['logo_src']}" alt="${branding_info['logo_tag']}" /></a>
+            </div>
             % endif
         </div>
         % endif
-        % if handout:
-        <div class="wrapper-handouts">
-            <h4 class="hd hd-5">${_('Handouts')}</h4>
-            <a class="btn-link" href="${handout}">${_('Download Handout')}</a>
-        </div>
-        % endif
-        % if branding_info:
-        <div class="branding">
-            <span class="host-tag">${branding_info['logo_tag']}</span>
-            <a href="${branding_info['url']}"><img class="brand-logo" src="${branding_info['logo_src']}" alt="${branding_info['logo_tag']}" /></a>
+        % if transcript_feedback_enabled:
+        <div class="wrapper-transcript-feedback" data-video-id='${video_id}' data-user-id='${user_id}'>
+            <h4 class="hd hd-5">${_('How is the transcript quality ?')}</h4>
+            <div class="transcript-feedback-buttons">
+                <div class="transcript-feedback-btn-wrapper">
+                    <button class="thumbs-up-btn">
+                        <span class="icon fa fa-thumbs-o-up thumbs-up-icon"></span>
+                    </button>
+                </div>
+                <div class="transcript-feedback-btn-wrapper">
+                    <button class="thumbs-down-btn">
+                        <span class="icon fa fa-thumbs-o-down thumbs-down-icon"></span>
+                    </button>
+                </div>
+            </div>
         </div>
         % endif
     </div>
-    % endif
 </div>
 
 % if cdn_eval:
diff --git a/lms/urls.py b/lms/urls.py
index 8b314f9f1ea2..ca6a240eaba8 100644
--- a/lms/urls.py
+++ b/lms/urls.py
@@ -227,11 +227,6 @@
         re_path(r'^api/mobile/(?P<api_version>v(2|1|0.5))/', include('lms.djangoapps.mobile_api.urls')),
     ]
 
-if settings.FEATURES.get('ENABLE_OPENBADGES'):
-    urlpatterns += [
-        path('api/badges/v1/', include(('lms.djangoapps.badges.api.urls', 'badges'), namespace='badges_api')),
-    ]
-
 urlpatterns += [
     path('openassessment/fileupload/', include('openassessment.fileupload.urls')),
 ]
diff --git a/mypy.ini b/mypy.ini
index 49d6f61b29d6..4d2f566fa311 100644
--- a/mypy.ini
+++ b/mypy.ini
@@ -2,7 +2,6 @@
 follow_imports = silent
 ignore_missing_imports = True
 allow_untyped_globals = True
-exclude = tests
 plugins =
     mypy_django_plugin.main,
     mypy_drf_plugin.main
@@ -11,8 +10,53 @@ files =
     openedx/core/djangoapps/content_staging,
     openedx/core/djangoapps/content_libraries,
     openedx/core/djangoapps/xblock,
-    openedx/core/types
+    openedx/core/types,
+    openedx/core/djangoapps/content_tagging
 
 [mypy.plugins.django-stubs]
 # content_staging only works with CMS; others work with either, so we run mypy with CMS settings.
 django_settings_module = "cms.envs.test"
+
+# Selectively ignore packages known to be lacking type hints
+[mypy-bridgekeeper.*]
+ignore_missing_imports = True
+[mypy-celery.*]
+ignore_missing_imports = True
+[mypy-celery_utils.*]
+ignore_missing_imports = True
+[mypy-completion.*]
+ignore_missing_imports = True
+[mypy-crum.*]
+ignore_missing_imports = True
+[mypy-ddt.*]
+ignore_missing_imports = True
+[mypy-edx_api_doc_tools.*]
+ignore_missing_imports = True
+[mypy-edx_django_utils.*]
+ignore_missing_imports = True
+[mypy-edx_proctoring.*]
+ignore_missing_imports = True
+[mypy-edx_rest_api_client.*]
+ignore_missing_imports = True
+[mypy-edx_rest_framework_extensions.*]
+ignore_missing_imports = True
+[mypy-eventtracking.*]
+ignore_missing_imports = True
+[mypy-fs.*]
+ignore_missing_imports = True
+[mypy-model_utils.*]
+ignore_missing_imports = True
+[mypy-openedx_events.*]
+ignore_missing_imports = True
+[mypy-organizations.*]
+ignore_missing_imports = True
+[mypy-search.*]
+ignore_missing_imports = True
+[mypy-rules.*]
+ignore_missing_imports = True
+[mypy-web_fragments.*]
+ignore_missing_imports = True
+[mypy-webob.*]
+ignore_missing_imports = True
+[mypy-xblock.*]
+ignore_missing_imports = True
diff --git a/openedx/core/djangoapps/catalog/tests/factories.py b/openedx/core/djangoapps/catalog/tests/factories.py
index f2760edf86c9..600b187f9d32 100644
--- a/openedx/core/djangoapps/catalog/tests/factories.py
+++ b/openedx/core/djangoapps/catalog/tests/factories.py
@@ -236,7 +236,6 @@ class ProgramTypeFactory(DictFactoryBase):
 class ProgramTypeAttrsFactory(DictFactoryBase):
     uuid = factory.Faker('uuid4')
     slug = factory.Faker('word')
-    coaching_supported = False
 
 
 class ProgramFactory(DictFactoryBase):
diff --git a/openedx/core/djangoapps/content_libraries/tests/test_runtime.py b/openedx/core/djangoapps/content_libraries/tests/test_runtime.py
index fefe1536a248..f166cee546ca 100644
--- a/openedx/core/djangoapps/content_libraries/tests/test_runtime.py
+++ b/openedx/core/djangoapps/content_libraries/tests/test_runtime.py
@@ -546,14 +546,14 @@ def test_i18n(self):
 
 
 @requires_blockstore
-class ContentLibraryXBlockUserStateBServiceTest(ContentLibraryXBlockUserStateTestMixin, TestCase):
+class ContentLibraryXBlockUserStateBServiceTest(ContentLibraryXBlockUserStateTestMixin, TestCase):  # type: ignore[misc]
     """
     Tests XBlock user state for XBlocks in a content library using the standalone Blockstore service.
     """
 
 
 @requires_blockstore_app
-class ContentLibraryXBlockUserStateTest(
+class ContentLibraryXBlockUserStateTest(  # type: ignore[misc]
     ContentLibraryXBlockUserStateTestMixin,
     BlockstoreAppTestMixin,
     LiveServerTestCase,
diff --git a/openedx/core/djangoapps/content_staging/tests/test_clipboard.py b/openedx/core/djangoapps/content_staging/tests/test_clipboard.py
index bc351b6b957e..00c4466b7d48 100644
--- a/openedx/core/djangoapps/content_staging/tests/test_clipboard.py
+++ b/openedx/core/djangoapps/content_staging/tests/test_clipboard.py
@@ -364,7 +364,7 @@ def test_no_stealing_clipboard_content(self):
         response = nonstaff_client.get(olx_url)
         assert response.status_code == 403
 
-    def assertXmlEqual(self, xml_str_a: str, xml_str_b: str) -> bool:
+    def assertXmlEqual(self, xml_str_a: str, xml_str_b: str):
         """ Assert that the given XML strings are equal, ignoring attribute order and some whitespace variations. """
         a = ElementTree.canonicalize(xml_str_a, strip_text=True)
         b = ElementTree.canonicalize(xml_str_b, strip_text=True)
diff --git a/openedx/core/djangoapps/content_tagging/api.py b/openedx/core/djangoapps/content_tagging/api.py
index 4867160c1b83..88cdf0d03eda 100644
--- a/openedx/core/djangoapps/content_tagging/api.py
+++ b/openedx/core/djangoapps/content_tagging/api.py
@@ -16,15 +16,16 @@
 
 def create_taxonomy(
     name: str,
-    description: str = None,
+    description: str | None = None,
     enabled=True,
     allow_multiple=False,
     allow_free_text=False,
+    orgs: list[Organization] | None = None,
 ) -> Taxonomy:
     """
     Creates, saves, and returns a new Taxonomy with the given attributes.
     """
-    return oel_tagging.create_taxonomy(
+    taxonomy = oel_tagging.create_taxonomy(
         name=name,
         description=description,
         enabled=enabled,
@@ -32,11 +33,16 @@ def create_taxonomy(
         allow_free_text=allow_free_text,
     )
 
+    if orgs is not None:
+        set_taxonomy_orgs(taxonomy=taxonomy, all_orgs=False, orgs=orgs)
+
+    return taxonomy
+
 
 def set_taxonomy_orgs(
     taxonomy: Taxonomy,
     all_orgs=False,
-    orgs: list[Organization] = None,
+    orgs: list[Organization] | None = None,
     relationship: TaxonomyOrg.RelType = TaxonomyOrg.RelType.OWNER,
 ):
     """
@@ -52,6 +58,9 @@ def set_taxonomy_orgs(
     If not `all_orgs`, the taxonomy is associated with each org in the `orgs` list. If that list is empty, the
     taxonomy is not associated with any orgs.
     """
+    if taxonomy.system_defined:
+        raise ValueError("Cannot set orgs for a system-defined taxonomy")
+
     TaxonomyOrg.objects.filter(
         taxonomy=taxonomy,
         rel_type=relationship,
@@ -102,7 +111,7 @@ def get_taxonomies_for_org(
 
 def get_content_tags(
     object_key: ContentKey,
-    taxonomy_id: str | None = None,
+    taxonomy_id: int | None = None,
 ) -> Iterator[ContentObjectTag]:
     """
     Generates a list of content tags for a given object.
@@ -120,7 +129,7 @@ def tag_content_object(
     object_key: ContentKey,
     taxonomy: Taxonomy,
     tags: list,
-) -> list[ContentObjectTag]:
+) -> Iterator[ContentObjectTag]:
     """
     This is the main API to use when you want to add/update/delete tags from a content object (e.g. an XBlock or
     course).
@@ -138,7 +147,7 @@ def tag_content_object(
     """
     if not taxonomy.system_defined:
         # We require that this taxonomy is linked to the content object's "org" or linked to "all orgs" (None):
-        org_short_name = object_key.org
+        org_short_name = object_key.org  # type: ignore
         if not taxonomy.taxonomyorg_set.filter(Q(org__short_name=org_short_name) | Q(org=None)).exists():
             raise ValueError(f"The specified Taxonomy is not enabled for the content object's org ({org_short_name})")
     oel_tagging.tag_object(
@@ -147,7 +156,7 @@ def tag_content_object(
         object_id=str(object_key),
         object_tag_class=ContentObjectTag,
     )
-    return get_content_tags(str(object_key), taxonomy_id=taxonomy.id)
+    return get_content_tags(object_key, taxonomy_id=taxonomy.id)
 
 
 # Expose the oel_tagging APIs
diff --git a/openedx/core/djangoapps/content_tagging/rest_api/v1/filters.py b/openedx/core/djangoapps/content_tagging/rest_api/v1/filters.py
index 9ad192f545de..723a90d8774a 100644
--- a/openedx/core/djangoapps/content_tagging/rest_api/v1/filters.py
+++ b/openedx/core/djangoapps/content_tagging/rest_api/v1/filters.py
@@ -2,20 +2,92 @@
 API Filters for content tagging org
 """
 
+from django.db.models import Exists, OuterRef, Q
 from rest_framework.filters import BaseFilterBackend
 
 import openedx_tagging.core.tagging.rules as oel_tagging
+from organizations.models import Organization
+
+from ...rules import get_admin_orgs, get_user_orgs
+from ...models import TaxonomyOrg
 
 
 class UserOrgFilterBackend(BaseFilterBackend):
     """
+    Filter taxonomies based on user's orgs roles
+
     Taxonomy admin can see all taxonomies
-    Everyone else can see only enabled taxonomies
+    Org staff can see all taxonomies from their orgs
+    Content creators and instructors can see enabled taxonomies avaliable to their orgs
+    """
+
+    def filter_queryset(self, request, queryset, _):
+        if oel_tagging.is_taxonomy_admin(request.user):
+            return queryset
 
+        orgs = list(Organization.objects.all())
+        user_admin_orgs = get_admin_orgs(request.user, orgs)
+        user_orgs = get_user_orgs(request.user, orgs)  # Orgs that the user is a content creator or instructor
+
+        if len(user_orgs) == 0 and len(user_admin_orgs) == 0:
+            return queryset.none()
+
+        return queryset.filter(
+            # Get enabled taxonomies available to all orgs, or from orgs that the user is
+            # a content creator or instructor
+            Q(
+                Exists(
+                    TaxonomyOrg.objects
+                    .filter(
+                        taxonomy=OuterRef("pk"),
+                        rel_type=TaxonomyOrg.RelType.OWNER,
+                    )
+                    .filter(
+                        Q(org=None) |
+                        Q(org__in=user_orgs)
+                    )
+                ),
+                enabled=True,
+            ) |
+            # Get all taxonomies from orgs that the user is OrgStaff
+            Q(
+                Exists(
+                    TaxonomyOrg.objects
+                    .filter(taxonomy=OuterRef("pk"), rel_type=TaxonomyOrg.RelType.OWNER)
+                    .filter(org__in=user_admin_orgs)
+                )
+            )
+        )
+
+
+class ObjectTagTaxonomyOrgFilterBackend(BaseFilterBackend):
+    """
+    Filter for ObjectTagViewSet to only show taxonomies that the user can view.
     """
 
     def filter_queryset(self, request, queryset, _):
         if oel_tagging.is_taxonomy_admin(request.user):
             return queryset
 
-        return queryset.filter(enabled=True)
+        orgs = list(Organization.objects.all())
+        user_admin_orgs = get_admin_orgs(request.user, orgs)
+        user_orgs = get_user_orgs(request.user, orgs)
+        user_or_admin_orgs = list(set(user_orgs) | set(user_admin_orgs))
+
+        return queryset.filter(taxonomy__enabled=True).filter(
+            # Get ObjectTags from taxonomies available to all orgs, or from orgs that the user is
+            # a OrgStaff, content creator or instructor
+            Q(
+                Exists(
+                    TaxonomyOrg.objects
+                    .filter(
+                        taxonomy=OuterRef("taxonomy_id"),
+                        rel_type=TaxonomyOrg.RelType.OWNER,
+                    )
+                    .filter(
+                        Q(org=None) |
+                        Q(org__in=user_or_admin_orgs)
+                    )
+                )
+            )
+        )
diff --git a/openedx/core/djangoapps/content_tagging/rest_api/v1/serializers.py b/openedx/core/djangoapps/content_tagging/rest_api/v1/serializers.py
index 1771816a14a7..058022ef7516 100644
--- a/openedx/core/djangoapps/content_tagging/rest_api/v1/serializers.py
+++ b/openedx/core/djangoapps/content_tagging/rest_api/v1/serializers.py
@@ -2,22 +2,99 @@
 API Serializers for content tagging org
 """
 
-from rest_framework import serializers
+from __future__ import annotations
+
+from django.core.exceptions import ObjectDoesNotExist
+from rest_framework import serializers, fields
 
 from openedx_tagging.core.tagging.rest_api.v1.serializers import (
     TaxonomyListQueryParamsSerializer,
+    TaxonomySerializer,
 )
 
 from organizations.models import Organization
 
 
+class OptionalSlugRelatedField(serializers.SlugRelatedField):
+    """
+    Modifies the DRF serializer SlugRelatedField.
+
+    Non-existent slug values are represented internally as an empty queryset, instead of throwing a validation error.
+    """
+
+    def to_internal_value(self, data):
+        """
+        Returns the object related to the given slug value, or an empty queryset if not found.
+        """
+
+        queryset = self.get_queryset()
+        try:
+            return queryset.get(**{self.slug_field: data})
+        except ObjectDoesNotExist:
+            return queryset.none()
+        except (TypeError, ValueError):
+            self.fail('invalid')
+
+
 class TaxonomyOrgListQueryParamsSerializer(TaxonomyListQueryParamsSerializer):
     """
     Serializer for the query params for the GET view
     """
 
-    org = serializers.SlugRelatedField(
+    org: fields.Field = OptionalSlugRelatedField(
+        slug_field="short_name",
+        queryset=Organization.objects.all(),
+        required=False,
+    )
+
+
+class TaxonomyUpdateOrgBodySerializer(serializers.Serializer):
+    """
+    Serializer for the body params for the update orgs action
+    """
+
+    orgs: fields.Field = serializers.SlugRelatedField(
+        many=True,
         slug_field="short_name",
         queryset=Organization.objects.all(),
         required=False,
     )
+
+    all_orgs: fields.Field = serializers.BooleanField(required=False)
+
+    def validate(self, attrs: dict) -> dict:
+        """
+        Validate the serializer data
+        """
+        if bool(attrs.get("orgs") is not None) == bool(attrs.get("all_orgs")):
+            raise serializers.ValidationError(
+                "You must specify either orgs or all_orgs, but not both."
+            )
+
+        return attrs
+
+
+class TaxonomyOrgSerializer(TaxonomySerializer):
+    """
+    Serializer for Taxonomy objects inclusing the associated orgs
+    """
+
+    orgs = serializers.SerializerMethodField()
+    all_orgs = serializers.SerializerMethodField()
+
+    def get_orgs(self, obj) -> list[str]:
+        """
+        Return the list of orgs for the taxonomy.
+         """
+        return [taxonomy_org.org.short_name for taxonomy_org in obj.taxonomyorg_set.all() if taxonomy_org.org]
+
+    def get_all_orgs(self, obj) -> bool:
+        """
+        Return True if the taxonomy is associated with all orgs.
+        """
+        return obj.taxonomyorg_set.filter(org__isnull=True).exists()
+
+    class Meta:
+        model = TaxonomySerializer.Meta.model
+        fields = TaxonomySerializer.Meta.fields + ["orgs", "all_orgs"]
+        read_only_fields = ["orgs", "all_orgs"]
diff --git a/openedx/core/djangoapps/content_tagging/rest_api/v1/tests/test_views.py b/openedx/core/djangoapps/content_tagging/rest_api/v1/tests/test_views.py
index 8cb4b94fd227..f3b82b831f94 100644
--- a/openedx/core/djangoapps/content_tagging/rest_api/v1/tests/test_views.py
+++ b/openedx/core/djangoapps/content_tagging/rest_api/v1/tests/test_views.py
@@ -2,11 +2,15 @@
 Tests tagging rest api views
 """
 
+from __future__ import annotations
+
 from urllib.parse import parse_qs, urlparse
+import json
 
+import abc
 import ddt
 from django.contrib.auth import get_user_model
-from django.test.testcases import override_settings
+from django.core.files.uploadedfile import SimpleUploadedFile
 from opaque_keys.edx.locator import BlockUsageLocator, CourseLocator
 from openedx_tagging.core.tagging.models import Tag, Taxonomy
 from openedx_tagging.core.tagging.models.system_defined import SystemDefinedTaxonomy
@@ -16,16 +20,34 @@
 from rest_framework.test import APITestCase
 
 from common.djangoapps.student.auth import add_users, update_org_role
-from common.djangoapps.student.roles import CourseStaffRole, OrgContentCreatorRole
+from common.djangoapps.student.roles import (
+    CourseInstructorRole,
+    CourseStaffRole,
+    OrgContentCreatorRole,
+    OrgInstructorRole,
+    OrgLibraryUserRole,
+    OrgStaffRole,
+)
+from openedx.core.djangoapps.content_libraries.api import (
+    AccessLevel,
+    create_library,
+    COMPLEX,
+    set_library_user_permissions,
+)
 from openedx.core.djangoapps.content_tagging.models import TaxonomyOrg
 from openedx.core.djangolib.testing.utils import skip_unless_cms
+from openedx.core.lib import blockstore_api
 
 User = get_user_model()
 
 TAXONOMY_ORG_LIST_URL = "/api/content_tagging/v1/taxonomies/"
 TAXONOMY_ORG_DETAIL_URL = "/api/content_tagging/v1/taxonomies/{pk}/"
+TAXONOMY_ORG_UPDATE_ORG_URL = "/api/content_tagging/v1/taxonomies/{pk}/orgs/"
 OBJECT_TAG_UPDATE_URL = "/api/content_tagging/v1/object_tags/{object_id}/?taxonomy={taxonomy_id}"
 TAXONOMY_TEMPLATE_URL = "/api/content_tagging/v1/taxonomies/import/{filename}"
+TAXONOMY_CREATE_IMPORT_URL = "/api/content_tagging/v1/taxonomies/import/"
+TAXONOMY_TAGS_IMPORT_URL = "/api/content_tagging/v1/taxonomies/{pk}/tags/import/"
+TAXONOMY_TAGS_URL = "/api/content_tagging/v1/taxonomies/{pk}/tags/"
 
 
 def check_taxonomy(
@@ -57,29 +79,102 @@ class TestTaxonomyObjectsMixin:
     """
     Sets up data for testing Content Taxonomies.
     """
+    def _setUp_orgs(self):
+        """
+        Create orgs for testing
+        """
+        self.orgA = Organization.objects.create(name="Organization A", short_name="orgA")
+        self.orgB = Organization.objects.create(name="Organization B", short_name="orgB")
+        self.orgX = Organization.objects.create(name="Organization X", short_name="orgX")
 
-    def setUp(self):
-        super().setUp()
+    def _setUp_courses(self):
+        """
+        Create courses for testing
+        """
+        self.courseA = CourseLocator("orgA", "101", "test")
+        self.courseB = CourseLocator("orgB", "101", "test")
+
+    def _setUp_library(self):
+        """
+        Create library for testing
+        """
+        self.collection = blockstore_api.create_collection("Test library collection")
+        self.content_libraryA = create_library(
+            collection_uuid=self.collection.uuid,
+            org=self.orgA,
+            slug="lib_a",
+            library_type=COMPLEX,
+            title="Library Org A",
+            description="This is a library from Org A",
+            allow_public_learning=False,
+            allow_public_read=False,
+            library_license="",
+        )
+
+    def _setUp_users(self):
+        """
+        Create users for testing
+        """
         self.user = User.objects.create(
             username="user",
             email="user@example.com",
         )
-        self.userS = User.objects.create(
+        self.staff = User.objects.create(
             username="staff",
             email="staff@example.com",
             is_staff=True,
         )
 
-        self.orgA = Organization.objects.create(name="Organization A", short_name="orgA")
-        self.orgB = Organization.objects.create(name="Organization B", short_name="orgB")
-        self.orgX = Organization.objects.create(name="Organization X", short_name="orgX")
-
-        self.userA = User.objects.create(
-            username="userA",
+        self.staffA = User.objects.create(
+            username="staffA",
             email="userA@example.com",
         )
-        update_org_role(self.userS, OrgContentCreatorRole, self.userA, [self.orgA.short_name])
+        update_org_role(self.staff, OrgStaffRole, self.staffA, [self.orgA.short_name])
+
+        self.content_creatorA = User.objects.create(
+            username="content_creatorA",
+            email="content_creatorA@example.com",
+        )
+        update_org_role(self.staff, OrgContentCreatorRole, self.content_creatorA, [self.orgA.short_name])
+
+        self.instructorA = User.objects.create(
+            username="instructorA",
+            email="instructorA@example.com",
+        )
+        update_org_role(self.staff, OrgInstructorRole, self.instructorA, [self.orgA.short_name])
+
+        self.library_staffA = User.objects.create(
+            username="library_staffA",
+            email="library_staffA@example.com",
+        )
+        update_org_role(self.staff, OrgLibraryUserRole, self.library_staffA, [self.orgA.short_name])
+
+        self.course_instructorA = User.objects.create(
+            username="course_instructorA",
+            email="course_instructorA@example.com",
+        )
+        add_users(self.staff, CourseInstructorRole(self.courseA), self.course_instructorA)
 
+        self.course_staffA = User.objects.create(
+            username="course_staffA",
+            email="course_staffA@example.com",
+        )
+        add_users(self.staff, CourseStaffRole(self.courseA), self.course_staffA)
+
+        self.library_userA = User.objects.create(
+            username="library_userA",
+            email="library_userA@example.com",
+        )
+        set_library_user_permissions(
+            self.content_libraryA.key,
+            self.library_userA,
+            AccessLevel.READ_LEVEL
+        )
+
+    def _setUp_taxonomies(self):
+        """
+        Create taxonomies for testing
+        """
         # Orphaned taxonomy
         self.ot1 = Taxonomy.objects.create(name="ot1", enabled=True)
         self.ot2 = Taxonomy.objects.create(name="ot2", enabled=False)
@@ -117,9 +212,7 @@ def setUp(self):
         self.tA1 = Taxonomy.objects.create(name="tA1", enabled=True)
         TaxonomyOrg.objects.create(
             taxonomy=self.tA1,
-            org=self.orgA,
-            rel_type=TaxonomyOrg.RelType.OWNER,
-        )
+            org=self.orgA, rel_type=TaxonomyOrg.RelType.OWNER,)
         self.tA2 = Taxonomy.objects.create(name="tA2", enabled=False)
         TaxonomyOrg.objects.create(
             taxonomy=self.tA2,
@@ -142,123 +235,166 @@ def setUp(self):
         )
 
         # OrgA and OrgB taxonomy
-        self.tC1 = Taxonomy.objects.create(name="tC1", enabled=True)
+        self.tBA1 = Taxonomy.objects.create(name="tBA1", enabled=True)
         TaxonomyOrg.objects.create(
-            taxonomy=self.tC1,
+            taxonomy=self.tBA1,
             org=self.orgA,
             rel_type=TaxonomyOrg.RelType.OWNER,
         )
         TaxonomyOrg.objects.create(
-            taxonomy=self.tC1,
+            taxonomy=self.tBA1,
             org=self.orgB,
             rel_type=TaxonomyOrg.RelType.OWNER,
         )
-        self.tC2 = Taxonomy.objects.create(name="tC2", enabled=False)
+        self.tBA2 = Taxonomy.objects.create(name="tBA2", enabled=False)
         TaxonomyOrg.objects.create(
-            taxonomy=self.tC2,
+            taxonomy=self.tBA2,
             org=self.orgA,
             rel_type=TaxonomyOrg.RelType.OWNER,
         )
         TaxonomyOrg.objects.create(
-            taxonomy=self.tC2,
+            taxonomy=self.tBA2,
             org=self.orgB,
             rel_type=TaxonomyOrg.RelType.OWNER,
         )
 
+    def setUp(self):
+
+        super().setUp()
+
+        self._setUp_orgs()
+        self._setUp_courses()
+        self._setUp_library()
+        self._setUp_users()
+        self._setUp_taxonomies()
+
 
 @skip_unless_cms
 @ddt.ddt
-@override_settings(FEATURES={"ENABLE_CREATOR_GROUP": True})
-class TestTaxonomyViewSet(TestTaxonomyObjectsMixin, APITestCase):
-    """
-    Test cases for TaxonomyViewSet when ENABLE_CREATOR_GROUP is True
-    """
-
-    @ddt.data(
-        ("user", None, None, ("ot1", "st1", "t1", "tA1", "tB1", "tC1")),
-        ("userA", None, None, ("ot1", "st1", "t1", "tA1", "tB1", "tC1")),
-        ("userS", None, None, ("ot1", "ot2", "st1", "st2", "t1", "t2", "tA1", "tA2", "tB1", "tB2")),
-        # Default page_size=10, and so "tC1" and "tC2" appear on the second page
-        ("user", True, None, ("ot1", "st1", "t1", "tA1", "tB1", "tC1")),
-        ("userA", True, None, ("ot1", "st1", "t1", "tA1", "tB1", "tC1")),
-        ("userS", True, None, ("ot1", "st1", "t1", "tA1", "tB1", "tC1")),
-        ("user", False, None, ()),
-        ("userA", False, None, ()),
-        ("userS", False, None, ("ot2", "st2", "t2", "tA2", "tB2", "tC2")),
-        ("user", None, "orgA", ("st1", "t1", "tA1", "tC1")),
-        ("userA", None, "orgA", ("st1", "t1", "tA1", "tC1")),
-        ("userS", None, "orgA", ("st1", "st2", "t1", "t2", "tA1", "tA2", "tC1", "tC2")),
-        ("user", True, "orgA", ("st1", "t1", "tA1", "tC1")),
-        ("userA", True, "orgA", ("st1", "t1", "tA1", "tC1")),
-        ("userS", True, "orgA", ("st1", "t1", "tA1", "tC1")),
-        ("user", False, "orgA", ()),
-        ("userA", False, "orgA", ()),
-        ("userS", False, "orgA", ("st2", "t2", "tA2", "tC2")),
-        ("user", None, "orgX", ("st1", "t1")),
-        ("userA", None, "orgX", ("st1", "t1")),
-        ("userS", None, "orgX", ("st1", "st2", "t1", "t2")),
-        ("user", True, "orgX", ("st1", "t1")),
-        ("userA", True, "orgX", ("st1", "t1")),
-        ("userS", True, "orgX", ("st1", "t1")),
-        ("user", False, "orgX", ()),
-        ("userA", False, "orgX", ()),
-        ("userS", False, "orgX", ("st2", "t2")),
-    )
-    @ddt.unpack
-    def test_list_taxonomy(self, user_attr, enabled_parameter, org_name, expected_taxonomies):
+class TestTaxonomyListCreateViewSet(TestTaxonomyObjectsMixin, APITestCase):
+    """
+    Test cases for TaxonomyViewSet for list and create actions
+    """
+
+    def _test_list_taxonomy(
+            self,
+            user_attr: str,
+            expected_taxonomies: list[str],
+            enabled_parameter: bool | None = None,
+            org_parameter: str | None = None
+    ) -> None:
+        """
+        Helper function to call the list endpoint and check the response
+        """
         url = TAXONOMY_ORG_LIST_URL
 
-        if user_attr:
-            user = getattr(self, user_attr)
-            self.client.force_authenticate(user=user)
+        user = getattr(self, user_attr)
+        self.client.force_authenticate(user=user)
 
         # Set parameters cleaning empty values
-        query_params = {k: v for k, v in {"enabled": enabled_parameter, "org": org_name}.items() if v is not None}
+        query_params = {k: v for k, v in {"enabled": enabled_parameter, "org": org_parameter}.items() if v is not None}
 
         response = self.client.get(url, query_params, format="json")
 
         assert response.status_code == status.HTTP_200_OK
         self.assertEqual(set(t["name"] for t in response.data["results"]), set(expected_taxonomies))
 
-    def test_list_taxonomy_invalid_org(
-        self,
-    ):
-        url = TAXONOMY_ORG_LIST_URL
-
-        self.client.force_authenticate(user=self.userS)
+    def test_list_taxonomy_staff(self) -> None:
+        """
+        Tests that staff users see all taxonomies
+        """
+        # Default page_size=10, and so "tBA1" and "tBA2" appear on the second page
+        expected_taxonomies = ["ot1", "ot2", "st1", "st2", "t1", "t2", "tA1", "tA2", "tB1", "tB2"]
+        self._test_list_taxonomy(
+            user_attr="staff",
+            expected_taxonomies=expected_taxonomies,
+        )
 
-        # Set parameters cleaning empty values
-        query_params = {"org": "invalidOrg"}
+    @ddt.data(
+        "content_creatorA",
+        "instructorA",
+        "library_staffA",
+        "course_instructorA",
+        "course_staffA",
+        "library_userA",
+    )
+    def test_list_taxonomy_orgA(self, user_attr: str) -> None:
+        """
+        Tests that non staff users from orgA can see only enabled taxonomies from orgA and global taxonomies
+        """
+        expected_taxonomies = ["st1", "t1", "tA1", "tBA1"]
+        self._test_list_taxonomy(
+            user_attr=user_attr,
+            enabled_parameter=True,
+            expected_taxonomies=expected_taxonomies,
+        )
 
-        response = self.client.get(url, query_params, format="json")
+    @ddt.data(
+        (True, ["ot1", "st1", "t1", "tA1", "tB1", "tBA1"]),
+        (False, ["ot2", "st2", "t2", "tA2", "tB2", "tBA2"]),
+    )
+    @ddt.unpack
+    def test_list_taxonomy_enabled_filter(self, enabled_parameter: bool, expected_taxonomies: list[str]) -> None:
+        """
+        Tests that the enabled filter works as expected
+        """
+        self._test_list_taxonomy(
+            user_attr="staff",
+            enabled_parameter=enabled_parameter,
+            expected_taxonomies=expected_taxonomies
+        )
 
-        assert response.status_code == status.HTTP_400_BAD_REQUEST
+    @ddt.data(
+        ("orgA", ["st1", "st2", "t1", "t2", "tA1", "tA2", "tBA1", "tBA2"]),
+        ("orgB", ["st1", "st2", "t1", "t2", "tB1", "tB2", "tBA1", "tBA2"]),
+        ("orgX", ["st1", "st2", "t1", "t2"]),
+        # Non-existent orgs are ignored
+        ("invalidOrg", ["st1", "st2", "t1", "t2"]),
+    )
+    @ddt.unpack
+    def test_list_taxonomy_org_filter(self, org_parameter: str, expected_taxonomies: list[str]) -> None:
+        """
+        Tests that the org filter works as expected
+        """
+        self._test_list_taxonomy(
+            user_attr="staff",
+            org_parameter=org_parameter,
+            expected_taxonomies=expected_taxonomies,
+        )
 
     @ddt.data(
-        ("user", ("tA1", "tB1", "tC1"), None),
-        ("userA", ("tA1", "tB1", "tC1"), None),
-        ("userS", ("st2", "t1", "t2"), "3"),
+        ("user", (), None),
+        ("staffA", ["tA2", "tBA1", "tBA2"], None),
+        ("staff", ["st2", "t1", "t2"], "3"),
     )
     @ddt.unpack
-    def test_list_taxonomy_pagination(self, user_attr, expected_taxonomies, expected_next_page):
+    def test_list_taxonomy_pagination(
+        self, user_attr: str, expected_taxonomies: list[str], expected_next_page: str | None
+    ) -> None:
+        """
+        Tests that the pagination works as expected
+        """
         url = TAXONOMY_ORG_LIST_URL
 
-        if user_attr:
-            user = getattr(self, user_attr)
-            self.client.force_authenticate(user=user)
+        user = getattr(self, user_attr)
+        self.client.force_authenticate(user=user)
 
         query_params = {"page_size": 3, "page": 2}
 
         response = self.client.get(url, query_params, format="json")
 
-        assert response.status_code == status.HTTP_200_OK
-        self.assertEqual(set(t["name"] for t in response.data["results"]), set(expected_taxonomies))
-        parsed_url = urlparse(response.data["next"])
+        assert response.status_code == status.HTTP_200_OK if len(expected_taxonomies) > 0 else status.HTTP_404_NOT_FOUND
+        if status.is_success(response.status_code):
+            self.assertEqual(set(t["name"] for t in response.data["results"]), set(expected_taxonomies))
+            parsed_url = urlparse(response.data["next"])
 
-        next_page = parse_qs(parsed_url.query).get("page", [None])[0]
-        assert next_page == expected_next_page
+            next_page = parse_qs(parsed_url.query).get("page", [None])[0]
+            assert next_page == expected_next_page
 
-    def test_list_invalid_page(self):
+    def test_list_invalid_page(self) -> None:
+        """
+        Tests that using an invalid page will raise NOT_FOUND
+        """
         url = TAXONOMY_ORG_LIST_URL
 
         self.client.force_authenticate(user=self.user)
@@ -270,79 +406,22 @@ def test_list_invalid_page(self):
         assert response.status_code == status.HTTP_404_NOT_FOUND
 
     @ddt.data(
-        (None, "ot1", status.HTTP_403_FORBIDDEN),
-        (None, "ot2", status.HTTP_403_FORBIDDEN),
-        (None, "st1", status.HTTP_403_FORBIDDEN),
-        (None, "st2", status.HTTP_403_FORBIDDEN),
-        (None, "t1", status.HTTP_403_FORBIDDEN),
-        (None, "t2", status.HTTP_403_FORBIDDEN),
-        (None, "tA1", status.HTTP_403_FORBIDDEN),
-        (None, "tA2", status.HTTP_403_FORBIDDEN),
-        (None, "tB1", status.HTTP_403_FORBIDDEN),
-        (None, "tB2", status.HTTP_403_FORBIDDEN),
-        (None, "tC1", status.HTTP_403_FORBIDDEN),
-        (None, "tC2", status.HTTP_403_FORBIDDEN),
-        ("user", "ot1", status.HTTP_200_OK),
-        ("user", "ot2", status.HTTP_404_NOT_FOUND),
-        ("user", "st1", status.HTTP_200_OK),
-        ("user", "st2", status.HTTP_404_NOT_FOUND),
-        ("user", "t1", status.HTTP_200_OK),
-        ("user", "t2", status.HTTP_404_NOT_FOUND),
-        ("user", "tA1", status.HTTP_200_OK),
-        ("user", "tA2", status.HTTP_404_NOT_FOUND),
-        ("user", "tB1", status.HTTP_200_OK),
-        ("user", "tB2", status.HTTP_404_NOT_FOUND),
-        ("user", "tC1", status.HTTP_200_OK),
-        ("user", "tC2", status.HTTP_404_NOT_FOUND),
-        ("userA", "ot1", status.HTTP_200_OK),
-        ("userA", "ot2", status.HTTP_404_NOT_FOUND),
-        ("userA", "st1", status.HTTP_200_OK),
-        ("userA", "st2", status.HTTP_404_NOT_FOUND),
-        ("userA", "t1", status.HTTP_200_OK),
-        ("userA", "t2", status.HTTP_404_NOT_FOUND),
-        ("userA", "tA1", status.HTTP_200_OK),
-        ("userA", "tA2", status.HTTP_404_NOT_FOUND),
-        ("userA", "tB1", status.HTTP_200_OK),
-        ("userA", "tB2", status.HTTP_404_NOT_FOUND),
-        ("userA", "tC1", status.HTTP_200_OK),
-        ("userA", "tC2", status.HTTP_404_NOT_FOUND),
-        ("userS", "ot1", status.HTTP_200_OK),
-        ("userS", "ot2", status.HTTP_200_OK),
-        ("userS", "st1", status.HTTP_200_OK),
-        ("userS", "st2", status.HTTP_200_OK),
-        ("userS", "t1", status.HTTP_200_OK),
-        ("userS", "t2", status.HTTP_200_OK),
-        ("userS", "tA1", status.HTTP_200_OK),
-        ("userS", "tA2", status.HTTP_200_OK),
-        ("userS", "tB1", status.HTTP_200_OK),
-        ("userS", "tB2", status.HTTP_200_OK),
-        ("userS", "tC1", status.HTTP_200_OK),
-        ("userS", "tC2", status.HTTP_200_OK),
-    )
-    @ddt.unpack
-    def test_detail_taxonomy(self, user_attr, taxonomy_attr, expected_status):
-        taxonomy = getattr(self, taxonomy_attr)
-
-        url = TAXONOMY_ORG_DETAIL_URL.format(pk=taxonomy.pk)
-
-        if user_attr:
-            user = getattr(self, user_attr)
-            self.client.force_authenticate(user=user)
-
-        response = self.client.get(url)
-        assert response.status_code == expected_status
-
-        if status.is_success(expected_status):
-            check_taxonomy(response.data, taxonomy.pk, **(TaxonomySerializer(taxonomy.cast()).data))
-
-    @ddt.data(
-        (None, status.HTTP_403_FORBIDDEN),
+        (None, status.HTTP_401_UNAUTHORIZED),
         ("user", status.HTTP_403_FORBIDDEN),
-        ("userA", status.HTTP_403_FORBIDDEN),
-        ("userS", status.HTTP_201_CREATED),
+        ("content_creatorA", status.HTTP_403_FORBIDDEN),
+        ("instructorA", status.HTTP_403_FORBIDDEN),
+        ("library_staffA", status.HTTP_403_FORBIDDEN),
+        ("course_instructorA", status.HTTP_403_FORBIDDEN),
+        ("course_staffA", status.HTTP_403_FORBIDDEN),
+        ("library_userA", status.HTTP_403_FORBIDDEN),
+        ("staffA", status.HTTP_201_CREATED),
+        ("staff", status.HTTP_201_CREATED),
     )
     @ddt.unpack
-    def test_create_taxonomy(self, user_attr, expected_status):
+    def test_create_taxonomy(self, user_attr: str, expected_status: int) -> None:
+        """
+        Tests that only Taxonomy admins and org level admins can create taxonomies
+        """
         url = TAXONOMY_ORG_LIST_URL
 
         create_data = {
@@ -367,305 +446,823 @@ def test_create_taxonomy(self, user_attr, expected_status):
             response = self.client.get(url)
             check_taxonomy(response.data, response.data["id"], **create_data)
 
-    @ddt.data(
-        (None, "ot1", status.HTTP_403_FORBIDDEN),
-        (None, "ot2", status.HTTP_403_FORBIDDEN),
-        (None, "st1", status.HTTP_403_FORBIDDEN),
-        (None, "st2", status.HTTP_403_FORBIDDEN),
-        (None, "t1", status.HTTP_403_FORBIDDEN),
-        (None, "t2", status.HTTP_403_FORBIDDEN),
-        (None, "tA1", status.HTTP_403_FORBIDDEN),
-        (None, "tA2", status.HTTP_403_FORBIDDEN),
-        (None, "tB1", status.HTTP_403_FORBIDDEN),
-        (None, "tB2", status.HTTP_403_FORBIDDEN),
-        (None, "tC1", status.HTTP_403_FORBIDDEN),
-        (None, "tC2", status.HTTP_403_FORBIDDEN),
-        ("user", "ot1", status.HTTP_403_FORBIDDEN),
-        ("user", "ot2", status.HTTP_403_FORBIDDEN),
-        ("user", "st1", status.HTTP_403_FORBIDDEN),
-        ("user", "st2", status.HTTP_403_FORBIDDEN),
-        ("user", "t1", status.HTTP_403_FORBIDDEN),
-        ("user", "t2", status.HTTP_403_FORBIDDEN),
-        ("user", "tA1", status.HTTP_403_FORBIDDEN),
-        ("user", "tA2", status.HTTP_403_FORBIDDEN),
-        ("user", "tB1", status.HTTP_403_FORBIDDEN),
-        ("user", "tB2", status.HTTP_403_FORBIDDEN),
-        ("user", "tC1", status.HTTP_403_FORBIDDEN),
-        ("user", "tC2", status.HTTP_403_FORBIDDEN),
-        ("userA", "ot1", status.HTTP_403_FORBIDDEN),
-        ("userA", "ot2", status.HTTP_403_FORBIDDEN),
-        ("userA", "st1", status.HTTP_403_FORBIDDEN),
-        ("userA", "st2", status.HTTP_403_FORBIDDEN),
-        ("userA", "t1", status.HTTP_403_FORBIDDEN),
-        ("userA", "t2", status.HTTP_403_FORBIDDEN),
-        ("userA", "tA1", status.HTTP_403_FORBIDDEN),
-        ("userA", "tA2", status.HTTP_403_FORBIDDEN),
-        ("userA", "tB1", status.HTTP_403_FORBIDDEN),
-        ("userA", "tB2", status.HTTP_403_FORBIDDEN),
-        ("userA", "tC1", status.HTTP_403_FORBIDDEN),
-        ("userA", "tC2", status.HTTP_403_FORBIDDEN),
-        ("userS", "ot1", status.HTTP_200_OK),
-        ("userS", "ot2", status.HTTP_200_OK),
-        ("userS", "st1", status.HTTP_403_FORBIDDEN),
-        ("userS", "st2", status.HTTP_403_FORBIDDEN),
-        ("userS", "t1", status.HTTP_200_OK),
-        ("userS", "t2", status.HTTP_200_OK),
-        ("userS", "t1", status.HTTP_200_OK),
-        ("userS", "t2", status.HTTP_200_OK),
-        ("userS", "tA1", status.HTTP_200_OK),
-        ("userS", "tA2", status.HTTP_200_OK),
-        ("userS", "tB1", status.HTTP_200_OK),
-        ("userS", "tB2", status.HTTP_200_OK),
-        ("userS", "tC1", status.HTTP_200_OK),
-        ("userS", "tC2", status.HTTP_200_OK),
-    )
-    @ddt.unpack
-    def test_update_taxonomy(self, user_attr, taxonomy_attr, expected_status):
-        taxonomy = getattr(self, taxonomy_attr)
+            # Also checks if the taxonomy was associated with the org
+            if user_attr == "staffA":
+                assert response.data["orgs"] == [self.orgA.short_name]
 
-        url = TAXONOMY_ORG_DETAIL_URL.format(pk=taxonomy.pk)
 
-        if user_attr:
-            user = getattr(self, user_attr)
-            self.client.force_authenticate(user=user)
+@ddt.ddt
+class TestTaxonomyDetailExportMixin(TestTaxonomyObjectsMixin):
+    """
+    Test cases to be used with detail and export actions
+    """
 
-        response = self.client.put(url, {"name": "new name"}, format="json")
-        assert response.status_code == expected_status
+    @abc.abstractmethod
+    def _test_api_call(self, **_kwargs) -> None:
+        """
+        Helper function to call the detail/export endpoint and check the response
+        """
 
-        # If we were able to update the taxonomy, check if the name changed
-        if status.is_success(expected_status):
-            response = self.client.get(url)
-            check_taxonomy(
-                response.data,
-                response.data["id"],
-                **{
-                    "name": "new name",
-                    "description": taxonomy.description,
-                    "enabled": taxonomy.enabled,
-                },
-            )
+    @ddt.data(
+        "user",
+        "content_creatorA",
+        "instructorA",
+        "library_staffA",
+        "course_instructorA",
+        "course_staffA",
+        "library_userA",
+    )
+    def test_detail_taxonomy_all_org_enabled(self, user_attr: str) -> None:
+        """
+        Tests that everyone can see enabled global taxonomies
+        """
+        self._test_api_call(
+            user_attr=user_attr,
+            taxonomy_attr="t1",
+            expected_status=status.HTTP_200_OK,
+            reason="Everyone should see enabled global taxonomies",
+        )
 
     @ddt.data(
-        (False, status.HTTP_403_FORBIDDEN),
-        (True, status.HTTP_403_FORBIDDEN),
+        ("content_creatorA", "tA1", "User with OrgContentCreatorRole(orgA) should see an enabled taxonomy from orgA"),
+        ("content_creatorA", "tBA1", "User with OrgContentCreatorRole(orgA) should see an enabled taxonomy from orgA"),
+        ("content_creatorA", "t1", "User with OrgContentCreatorRole(orgA) should see an enabled global taxonomy"),
+        ("instructorA", "tA1", "User with OrgInstructorRole(orgA) should see an enabled taxonomy from orgA"),
+        ("instructorA", "tBA1", "User with OrgInstructorRole(orgA) should see an enabled taxonomy from orgA"),
+        ("instructorA", "t1", "User with OrgInstructorRole(orgA) should see an enabled global taxonomy"),
+        ("library_staffA", "tA1", "User with OrgLibraryUserRole(orgA) should see an enabled taxonomy from orgA"),
+        ("library_staffA", "tBA1", "User with OrgLibraryUserRole(orgA) should see an enabled taxonomy from orgA"),
+        ("library_staffA", "t1", "User with OrgInstructorRole(orgA) should see an enabled global taxonomy"),
+        (
+            "course_instructorA",
+            "tA1",
+            "User with CourseInstructorRole in a course from orgA should see an enabled taxonomy from orgA"
+        ),
+        (
+            "course_instructorA",
+            "tBA1",
+            "User with CourseInstructorRole in a course from orgA should see an enabled taxonomy from orgA"
+        ),
+        (
+            "course_instructorA",
+            "t1",
+            "User with CourseInstructorRole in a course from orgA should see an enabled global taxonomy"
+        ),
+        (
+            "course_staffA",
+            "tA1",
+            "User with CourseStaffRole in a course from orgA should see an enabled taxonomy from orgA"
+        ),
+        (
+            "course_staffA",
+            "tBA1",
+            "User with CourseStaffRole in a course from orgA should see an enabled taxonomy from orgA"
+        ),
+        (
+            "course_staffA",
+            "t1",
+            "User with CourseStaffRole in a course from orgA should see an enabled global taxonomy"
+        ),
+        (
+            "library_userA",
+            "tA1",
+            "User with permission on a library from orgA should see an enabled taxonomy from orgA"
+        ),
+        (
+            "library_userA",
+            "tBA1",
+            "User with permission on a library from orgA should see an enabled taxonomy from orgA"
+        ),
+        (
+            "library_userA",
+            "t1",
+            "User with permission on a library from orgA should see an enabled global taxonomy"
+        ),
     )
     @ddt.unpack
-    def test_update_taxonomy_system_defined(self, update_value, expected_status):
+    def test_detail_taxonomy_org_user_see_enabled(self, user_attr: str, taxonomy_attr: str, reason: str) -> None:
         """
-        Test that we can't update system_defined field
+        Tests that org users (content creators and instructors) can see enabled global taxonomies and taxonomies
+        from their orgs
         """
-        url = TAXONOMY_ORG_DETAIL_URL.format(pk=self.st1.pk)
+        self._test_api_call(
+            user_attr=user_attr,
+            taxonomy_attr=taxonomy_attr,
+            expected_status=status.HTTP_200_OK,
+            reason=reason,
+        )
 
-        self.client.force_authenticate(user=self.userS)
-        response = self.client.put(url, {"name": "new name", "system_defined": update_value}, format="json")
-        assert response.status_code == expected_status
+    @ddt.data(
+        "tA2",
+        "tBA2",
+    )
+    def test_detail_taxonomy_org_admin_see_disabled(self, taxonomy_attr: str) -> None:
+        """
+        Tests that org admins can see disabled taxonomies from their orgs
+        """
+        self._test_api_call(
+            user_attr="staffA",
+            taxonomy_attr=taxonomy_attr,
+            expected_status=status.HTTP_200_OK,
+            reason="User with OrgContentCreatorRole(orgA) should see a disabled taxonomy from orgA",
+        )
 
-        # Verify that system_defined has not changed
-        response = self.client.get(url)
-        assert response.data["system_defined"] is True
-
-    @ddt.data(
-        (None, "ot1", status.HTTP_403_FORBIDDEN),
-        (None, "ot2", status.HTTP_403_FORBIDDEN),
-        (None, "st1", status.HTTP_403_FORBIDDEN),
-        (None, "st2", status.HTTP_403_FORBIDDEN),
-        (None, "t1", status.HTTP_403_FORBIDDEN),
-        (None, "t2", status.HTTP_403_FORBIDDEN),
-        (None, "tA1", status.HTTP_403_FORBIDDEN),
-        (None, "tA2", status.HTTP_403_FORBIDDEN),
-        (None, "tB1", status.HTTP_403_FORBIDDEN),
-        (None, "tB2", status.HTTP_403_FORBIDDEN),
-        (None, "tC1", status.HTTP_403_FORBIDDEN),
-        (None, "tC2", status.HTTP_403_FORBIDDEN),
-        ("user", "ot1", status.HTTP_403_FORBIDDEN),
-        ("user", "ot2", status.HTTP_403_FORBIDDEN),
-        ("user", "st1", status.HTTP_403_FORBIDDEN),
-        ("user", "st2", status.HTTP_403_FORBIDDEN),
-        ("user", "t1", status.HTTP_403_FORBIDDEN),
-        ("user", "t2", status.HTTP_403_FORBIDDEN),
-        ("user", "tA1", status.HTTP_403_FORBIDDEN),
-        ("user", "tA2", status.HTTP_403_FORBIDDEN),
-        ("user", "tB1", status.HTTP_403_FORBIDDEN),
-        ("user", "tB2", status.HTTP_403_FORBIDDEN),
-        ("user", "tC1", status.HTTP_403_FORBIDDEN),
-        ("user", "tC2", status.HTTP_403_FORBIDDEN),
-        ("userA", "ot1", status.HTTP_403_FORBIDDEN),
-        ("userA", "ot2", status.HTTP_403_FORBIDDEN),
-        ("userA", "st1", status.HTTP_403_FORBIDDEN),
-        ("userA", "st2", status.HTTP_403_FORBIDDEN),
-        ("userA", "t1", status.HTTP_403_FORBIDDEN),
-        ("userA", "t2", status.HTTP_403_FORBIDDEN),
-        ("userA", "tA1", status.HTTP_403_FORBIDDEN),
-        ("userA", "tA2", status.HTTP_403_FORBIDDEN),
-        ("userA", "tB1", status.HTTP_403_FORBIDDEN),
-        ("userA", "tB2", status.HTTP_403_FORBIDDEN),
-        ("userA", "tC1", status.HTTP_403_FORBIDDEN),
-        ("userA", "tC2", status.HTTP_403_FORBIDDEN),
-        ("userS", "ot1", status.HTTP_200_OK),
-        ("userS", "ot2", status.HTTP_200_OK),
-        ("userS", "st1", status.HTTP_403_FORBIDDEN),
-        ("userS", "st2", status.HTTP_403_FORBIDDEN),
-        ("userS", "t1", status.HTTP_200_OK),
-        ("userS", "t2", status.HTTP_200_OK),
-        ("userS", "tA1", status.HTTP_200_OK),
-        ("userS", "tA2", status.HTTP_200_OK),
-        ("userS", "tB1", status.HTTP_200_OK),
-        ("userS", "tB2", status.HTTP_200_OK),
-        ("userS", "tC1", status.HTTP_200_OK),
-        ("userS", "tC2", status.HTTP_200_OK),
+    @ddt.data(
+        "st2",
+        "t2",
     )
-    @ddt.unpack
-    def test_patch_taxonomy(self, user_attr, taxonomy_attr, expected_status):
-        taxonomy = getattr(self, taxonomy_attr)
+    def test_detail_taxonomy_org_admin_dont_see_disabled_global(self, taxonomy_attr: str) -> None:
+        """
+        Tests that org admins can't see disabled global taxonomies
+        """
+        self._test_api_call(
+            user_attr="staffA",
+            taxonomy_attr=taxonomy_attr,
+            expected_status=status.HTTP_404_NOT_FOUND,
+            reason="User with OrgContentCreatorRole(orgA) shouldn't see a disabled global taxonomy",
+        )
 
-        url = TAXONOMY_ORG_DETAIL_URL.format(pk=taxonomy.pk)
+    @ddt.data(
+        ("content_creatorA", "t2", "User with OrgContentCreatorRole(orgA) shouldn't see a disabled global taxonomy"),
+        ("instructorA", "tA2", "User with OrgInstructorRole(orgA) shouldn't see a disabled taxonomy from orgA"),
+        ("instructorA", "tBA2", "User with OrgInstructorRole(orgA) shouldn't see a disabled taxonomy from orgA"),
+        ("instructorA", "t2", "User with OrgInstructorRole(orgA) shouldn't see a disabled global taxonomy"),
+        ("library_staffA", "tA2", "User with OrgLibraryUserRole(orgA) shouldn't see a disabled taxonomy from orgA"),
+        ("library_staffA", "tBA2", "User with OrgLibraryUserRole(orgA) shouldn't see a disabled taxonomy from orgA"),
+        ("library_staffA", "t2", "User with OrgInstructorRole(orgA) shouldn't see a disabled global taxonomy"),
+        (
+            "course_instructorA",
+            "tA2",
+            "User with CourseInstructorRole in a course from orgA shouldn't see a disabled taxonomy from orgA"
+        ),
+        (
+            "course_instructorA",
+            "tBA2",
+            "User with CourseInstructorRole in a course from orgA shouldn't see a disabled taxonomy from orgA"
+        ),
+        (
+            "course_instructorA",
+            "t2",
+            "User with CourseInstructorRole in a course from orgA shouldn't see a disabled global taxonomy"
+        ),
+        (
+            "course_staffA",
+            "tA2",
+            "User with CourseStaffRole in a course from orgA shouldn't see a disabled taxonomy from orgA"
+        ),
+        (
+            "course_staffA",
+            "tBA2",
+            "User with CourseStaffRole in a course from orgA shouldn't see a disabled taxonomy from orgA"
+        ),
+        (
+            "course_staffA",
+            "t2",
+            "User with CourseStaffRole in a course from orgA should't see a disabled global taxonomy"
+        ),
+        (
+            "library_userA",
+            "tA2",
+            "User with permission on a library from orgA shouldn't see an disabled taxonomy from orgA"
+        ),
+        (
+            "library_userA",
+            "tBA2",
+            "User with permission on a library from orgA shouldn't see an disabled taxonomy from orgA"
+        ),
+        (
+            "library_userA",
+            "t2",
+            "User with permission on a library from orgA shouldn't see an disabled global taxonomy"
+        ),
+    )
+    @ddt.unpack
+    def test_detail_taxonomy_org_user_dont_see_disabled(self, user_attr: str, taxonomy_attr: str, reason: str) -> None:
+        """
+        Tests that org users (content creators and instructors) can't see disabled global taxonomies and taxonomies
+        from their orgs
+        """
+        self._test_api_call(
+            user_attr=user_attr,
+            taxonomy_attr=taxonomy_attr,
+            expected_status=status.HTTP_404_NOT_FOUND,
+            reason=reason,
+        )
 
-        if user_attr:
-            user = getattr(self, user_attr)
-            self.client.force_authenticate(user=user)
+    @ddt.data(
+        ("staff", "ot1", "Staff should see an enabled no org taxonomy"),
+        ("staff", "ot2", "Staff should see a disabled no org taxonomy"),
+    )
+    @ddt.unpack
+    def test_detail_taxonomy_staff_see_no_org(self, user_attr: str, taxonomy_attr: str, reason: str) -> None:
+        """
+        Tests that staff can see taxonomies with no org
+        """
+        self._test_api_call(
+            user_attr=user_attr,
+            taxonomy_attr=taxonomy_attr,
+            expected_status=status.HTTP_200_OK,
+            reason=reason,
+        )
 
-        response = self.client.patch(url, {"name": "new name"}, format="json")
-        assert response.status_code == expected_status
+    @ddt.data(
+        "staffA",
+        "content_creatorA",
+        "instructorA",
+        "library_staffA",
+        "course_instructorA",
+        "course_staffA",
+        "library_userA"
+    )
+    def test_detail_taxonomy_other_dont_see_no_org(self, user_attr: str) -> None:
+        """
+        Tests that org users can't see taxonomies with no org
+        """
+        self._test_api_call(
+            user_attr=user_attr,
+            taxonomy_attr="ot1",
+            expected_status=status.HTTP_404_NOT_FOUND,
+            reason="Only staff should see taxonomies with no org",
+        )
 
-        # If we were able to patch the taxonomy, check if the name changed
-        if status.is_success(expected_status):
-            response = self.client.get(url)
-            check_taxonomy(
-                response.data,
-                response.data["id"],
-                **{
-                    "name": "new name",
-                    "description": taxonomy.description,
-                    "enabled": taxonomy.enabled,
-                },
-            )
+    @ddt.data(
+        "staffA",
+        "content_creatorA",
+        "instructorA",
+        "library_staffA",
+        "course_instructorA",
+        "course_staffA",
+        "library_userA"
+    )
+    def test_detail_taxonomy_dont_see_other_org(self, user_attr: str) -> None:
+        """
+        Tests that org users can't see taxonomies from other orgs
+        """
+        self._test_api_call(
+            user_attr=user_attr,
+            taxonomy_attr="tB1",
+            expected_status=status.HTTP_404_NOT_FOUND,
+            reason="Users shouldn't see taxonomies from other orgs",
+        )
 
     @ddt.data(
-        (False, status.HTTP_403_FORBIDDEN),
-        (True, status.HTTP_403_FORBIDDEN),
+        "ot1",
+        "ot2",
+        "st1",
+        "st2",
+        "t1",
+        "t2",
+        "tA1",
+        "tA2",
+        "tB1",
+        "tB2",
+        "tBA1",
+        "tBA2",
     )
-    @ddt.unpack
-    def test_patch_taxonomy_system_defined(self, update_value, expected_status):
+    def test_detail_taxonomy_staff_see_all(self, taxonomy_attr: str) -> None:
         """
-        Test that we can't patch system_defined field
+        Tests that staff can see all taxonomies
         """
-        url = TAXONOMY_ORG_DETAIL_URL.format(pk=self.st1.pk)
+        self._test_api_call(
+            user_attr="staff",
+            taxonomy_attr=taxonomy_attr,
+            expected_status=status.HTTP_200_OK,
+            reason="Staff should see all taxonomies",
+        )
 
-        self.client.force_authenticate(user=self.userS)
-        response = self.client.patch(url, {"name": "new name", "system_defined": update_value}, format="json")
-        assert response.status_code == expected_status
 
-        # Verify that system_defined has not changed
-        response = self.client.get(url)
-        assert response.data["system_defined"] is True
-
-    @ddt.data(
-        (None, "ot1", status.HTTP_403_FORBIDDEN),
-        (None, "ot2", status.HTTP_403_FORBIDDEN),
-        (None, "st1", status.HTTP_403_FORBIDDEN),
-        (None, "st2", status.HTTP_403_FORBIDDEN),
-        (None, "t1", status.HTTP_403_FORBIDDEN),
-        (None, "t2", status.HTTP_403_FORBIDDEN),
-        (None, "tA1", status.HTTP_403_FORBIDDEN),
-        (None, "tA2", status.HTTP_403_FORBIDDEN),
-        (None, "tB1", status.HTTP_403_FORBIDDEN),
-        (None, "tB2", status.HTTP_403_FORBIDDEN),
-        (None, "tC1", status.HTTP_403_FORBIDDEN),
-        (None, "tC2", status.HTTP_403_FORBIDDEN),
-        ("user", "ot1", status.HTTP_403_FORBIDDEN),
-        ("user", "ot2", status.HTTP_403_FORBIDDEN),
-        ("user", "st1", status.HTTP_403_FORBIDDEN),
-        ("user", "st2", status.HTTP_403_FORBIDDEN),
-        ("user", "t1", status.HTTP_403_FORBIDDEN),
-        ("user", "t2", status.HTTP_403_FORBIDDEN),
-        ("user", "tA1", status.HTTP_403_FORBIDDEN),
-        ("user", "tA2", status.HTTP_403_FORBIDDEN),
-        ("user", "tB1", status.HTTP_403_FORBIDDEN),
-        ("user", "tB2", status.HTTP_403_FORBIDDEN),
-        ("user", "tC1", status.HTTP_403_FORBIDDEN),
-        ("user", "tC2", status.HTTP_403_FORBIDDEN),
-        ("userA", "ot1", status.HTTP_403_FORBIDDEN),
-        ("userA", "ot2", status.HTTP_403_FORBIDDEN),
-        ("userA", "st1", status.HTTP_403_FORBIDDEN),
-        ("userA", "st2", status.HTTP_403_FORBIDDEN),
-        ("userA", "t1", status.HTTP_403_FORBIDDEN),
-        ("userA", "t2", status.HTTP_403_FORBIDDEN),
-        ("userA", "tA1", status.HTTP_403_FORBIDDEN),
-        ("userA", "tA2", status.HTTP_403_FORBIDDEN),
-        ("userA", "tB1", status.HTTP_403_FORBIDDEN),
-        ("userA", "tB2", status.HTTP_403_FORBIDDEN),
-        ("userA", "tC1", status.HTTP_403_FORBIDDEN),
-        ("userA", "tC2", status.HTTP_403_FORBIDDEN),
-        ("userS", "ot1", status.HTTP_204_NO_CONTENT),
-        ("userS", "ot2", status.HTTP_204_NO_CONTENT),
-        ("userS", "st1", status.HTTP_403_FORBIDDEN),
-        ("userS", "st2", status.HTTP_403_FORBIDDEN),
-        ("userS", "t1", status.HTTP_204_NO_CONTENT),
-        ("userS", "t2", status.HTTP_204_NO_CONTENT),
-        ("userS", "tA1", status.HTTP_204_NO_CONTENT),
-        ("userS", "tA2", status.HTTP_204_NO_CONTENT),
-        ("userS", "tB1", status.HTTP_204_NO_CONTENT),
-        ("userS", "tB2", status.HTTP_204_NO_CONTENT),
-        ("userS", "tC1", status.HTTP_204_NO_CONTENT),
-        ("userS", "tC2", status.HTTP_204_NO_CONTENT),
-    )
-    @ddt.unpack
-    def test_delete_taxonomy(self, user_attr, taxonomy_attr, expected_status):
+@skip_unless_cms
+class TestTaxonomyDetailViewSet(TestTaxonomyDetailExportMixin, APITestCase):
+    """
+    Test cases for TaxonomyViewSet with detail action
+    """
+
+    def _test_api_call(self, **kwargs) -> None:
+        """
+        Helper function to call the retrieve endpoint and check the response
+        """
+        user_attr = kwargs.get("user_attr")
+        taxonomy_attr = kwargs.get("taxonomy_attr")
+        expected_status = kwargs.get("expected_status")
+        reason = kwargs.get("reason", "Unexpected response status")
+
+        assert taxonomy_attr is not None, "taxonomy_attr is required"
+        assert user_attr is not None, "user_attr is required"
+        assert expected_status is not None, "expected_status is required"
+
         taxonomy = getattr(self, taxonomy_attr)
 
         url = TAXONOMY_ORG_DETAIL_URL.format(pk=taxonomy.pk)
 
-        if user_attr:
-            user = getattr(self, user_attr)
-            self.client.force_authenticate(user=user)
+        user = getattr(self, user_attr)
+        self.client.force_authenticate(user=user)
 
-        response = self.client.delete(url)
-        assert response.status_code == expected_status
+        response = self.client.get(url)
+        assert response.status_code == expected_status, reason
 
-        # If we were able to delete the taxonomy, check that it's really gone
         if status.is_success(expected_status):
-            response = self.client.get(url)
-            assert response.status_code == status.HTTP_404_NOT_FOUND
+            check_taxonomy(response.data, taxonomy.pk, **(TaxonomySerializer(taxonomy.cast()).data))
 
 
 @skip_unless_cms
-@ddt.ddt
-@override_settings(FEATURES={"ENABLE_CREATOR_GROUP": False})
-class TestTaxonomyViewSetNoCreatorGroup(TestTaxonomyViewSet):  # pylint: disable=test-inherits-tests
+class TestTaxonomyExportViewSet(TestTaxonomyDetailExportMixin, APITestCase):
     """
-    Test cases for TaxonomyViewSet when ENABLE_CREATOR_GROUP is False
-
-    The permissions are the same for when ENABLED_CREATOR_GRUP is True
+    Test cases for TaxonomyViewSet with export action
     """
 
+    def _test_api_call(self, **kwargs) -> None:
+        """
+        Helper function to call the export endpoint and check the response
+        """
+        user_attr = kwargs.get("user_attr")
+        taxonomy_attr = kwargs.get("taxonomy_attr")
+        expected_status = kwargs.get("expected_status")
+        reason = kwargs.get("reason", "Unexpected response status")
+
+        assert taxonomy_attr is not None, "taxonomy_attr is required"
+        assert user_attr is not None, "user_attr is required"
+        assert expected_status is not None, "expected_status is required"
+
+        taxonomy = getattr(self, taxonomy_attr)
+
+        url = TAXONOMY_ORG_DETAIL_URL.format(pk=taxonomy.pk)
+
+        user = getattr(self, user_attr)
+        self.client.force_authenticate(user=user)
+
+        response = self.client.get(url)
+        assert response.status_code == expected_status, reason
+        assert len(response.data) > 0
+
 
-@skip_unless_cms
 @ddt.ddt
-class TestObjectTagViewSet(TestTaxonomyObjectsMixin, APITestCase):
+class TestTaxonomyChangeMixin(TestTaxonomyObjectsMixin):
     """
-    Testing various cases for the ObjectTagView.
+    Test cases to be used with update, patch and delete actions
     """
-    def setUp(self):
+
+    @abc.abstractmethod
+    def _test_api_call(self, **_kwargs) -> None:
         """
-        Setup the test cases
+        Helper function to call the update/patch/delete endpoint and check the response
         """
-        super().setUp()
-        self.courseA = CourseLocator("orgA", "101", "test")
-        self.xblockA = BlockUsageLocator(
-            course_key=self.courseA,
-            block_type='problem',
-            block_id='block_id'
-        )
-        self.courseB = CourseLocator("orgB", "101", "test")
-        self.xblockB = BlockUsageLocator(
-            course_key=self.courseB,
-            block_type='problem',
-            block_id='block_id'
-        )
 
-        self.multiple_taxonomy = Taxonomy.objects.create(name="Multiple Taxonomy", allow_multiple=True)
-        self.single_value_taxonomy = Taxonomy.objects.create(name="Required Taxonomy", allow_multiple=False)
-        for i in range(20):
+    @ddt.data(
+        "ot1",
+        "ot2",
+        "st1",
+        "st2",
+        "t1",
+        "t2",
+        "tA1",
+        "tA2",
+        "tB1",
+        "tB2",
+        "tBA1",
+        "tBA2",
+    )
+    def test_regular_user_cant_edit_taxonomies(self, taxonomy_attr: str) -> None:
+        """
+        Tests that regular users can't edit taxonomies
+        """
+        self._test_api_call(
+            user_attr="user",
+            taxonomy_attr=taxonomy_attr,
+            expected_status=[status.HTTP_403_FORBIDDEN, status.HTTP_404_NOT_FOUND],
+            reason="Regular users shouldn't be able to edit taxonomies",
+        )
+
+    @ddt.data(
+        "content_creatorA",
+        "instructorA",
+        "library_staffA",
+        "course_instructorA",
+        "course_staffA",
+        "library_userA",
+    )
+    def test_org_user_cant_edit_org_taxonomies(self, user_attr: str) -> None:
+        """
+        Tests that content creators and instructors from orgA can't edit taxonomies from orgA
+        """
+        self._test_api_call(
+            user_attr=user_attr,
+            taxonomy_attr="tA1",
+            expected_status=[status.HTTP_403_FORBIDDEN],
+            reason="Content creators and instructors shouldn't be able to edit taxonomies",
+        )
+
+    @ddt.data(
+        "tA1",
+        "tA2",
+        "tBA1",
+        "tBA2",
+    )
+    def test_org_staff_can_edit_org_taxonomies(self, taxonomy_attr: str) -> None:
+        """
+        Tests that org staff can edit taxonomies from their orgs
+        """
+        self._test_api_call(
+            user_attr="staffA",
+            taxonomy_attr=taxonomy_attr,
+            # Check both status: 200 for update and 204 for delete
+            expected_status=[status.HTTP_200_OK, status.HTTP_204_NO_CONTENT],
+            reason="Org staff should be able to edit taxonomies from their orgs",
+        )
+
+    @ddt.data(
+        "tB1",
+        "tB2",
+    )
+    def test_org_staff_cant_edit_other_org_taxonomies(self, taxonomy_attr: str) -> None:
+        """
+        Tests that org staff can't edit taxonomies from other orgs
+        """
+        self._test_api_call(
+            user_attr="staffA",
+            taxonomy_attr=taxonomy_attr,
+            expected_status=[status.HTTP_403_FORBIDDEN, status.HTTP_404_NOT_FOUND],
+            reason="Org staff shouldn't be able to edit taxonomies from other orgs",
+        )
+
+    @ddt.data(
+        "ot1",
+        "ot2",
+        "t1",
+        "t2",
+        "tA1",
+        "tA2",
+        "tB1",
+        "tB2",
+        "tBA1",
+        "tBA2",
+
+    )
+    def test_staff_can_edit_almost_all_taxonomies(self, taxonomy_attr: str) -> None:
+        """
+        Tests that staff can edit all but system defined taxonomies
+        """
+        self._test_api_call(
+            user_attr="staff",
+            taxonomy_attr=taxonomy_attr,
+            # Check both status: 200 for update and 204 for delete
+            expected_status=[status.HTTP_200_OK, status.HTTP_204_NO_CONTENT],
+            reason="Staff should be able to edit all but system defined taxonomies",
+        )
+
+    @ddt.data(
+        "st1",
+        "st2",
+    )
+    def test_staff_cant_edit_system_defined_taxonomies(self, taxonomy_attr: str) -> None:
+        """
+        Tests that staff can't edit system defined taxonomies
+        """
+        self._test_api_call(
+            user_attr="staff",
+            taxonomy_attr=taxonomy_attr,
+            # Check both status: 200 for update and 204 for delete
+            expected_status=[status.HTTP_403_FORBIDDEN],
+            reason="Staff shouldn't be able to edit system defined ",
+        )
+
+
+@skip_unless_cms
+class TestTaxonomyUpdateViewSet(TestTaxonomyChangeMixin, APITestCase):
+    """
+    Test cases for TaxonomyViewSet with PUT method
+    """
+
+    def _test_api_call(self, **kwargs) -> None:
+        user_attr = kwargs.get("user_attr")
+        taxonomy_attr = kwargs.get("taxonomy_attr")
+        expected_status = kwargs.get("expected_status")
+        reason = kwargs.get("reason", "Unexpected response status")
+
+        assert taxonomy_attr is not None, "taxonomy_attr is required"
+        assert user_attr is not None, "user_attr is required"
+        assert expected_status is not None, "expected_status is required"
+
+        taxonomy = getattr(self, taxonomy_attr)
+
+        url = TAXONOMY_ORG_DETAIL_URL.format(pk=taxonomy.pk)
+
+        user = getattr(self, user_attr)
+        self.client.force_authenticate(user=user)
+
+        response = self.client.put(url, {"name": "new name"}, format="json")
+        assert response.status_code in expected_status, reason
+
+        # If we were able to update the taxonomy, check if the name changed
+        if status.is_success(response.status_code):
+            response = self.client.get(url)
+            check_taxonomy(
+                response.data,
+                response.data["id"],
+                **{
+                    "name": "new name",
+                    "description": taxonomy.description,
+                    "enabled": taxonomy.enabled,
+                },
+            )
+
+
+@skip_unless_cms
+class TestTaxonomyPatchViewSet(TestTaxonomyChangeMixin, APITestCase):
+    """
+    Test cases for TaxonomyViewSet with PATCH method
+    """
+
+    def _test_api_call(self, **kwargs) -> None:
+        user_attr = kwargs.get("user_attr")
+        taxonomy_attr = kwargs.get("taxonomy_attr")
+        expected_status = kwargs.get("expected_status")
+        reason = kwargs.get("reason", "Unexpected response status")
+
+        assert taxonomy_attr is not None, "taxonomy_attr is required"
+        assert user_attr is not None, "user_attr is required"
+        assert expected_status is not None, "expected_status is required"
+
+        taxonomy = getattr(self, taxonomy_attr)
+
+        url = TAXONOMY_ORG_DETAIL_URL.format(pk=taxonomy.pk)
+
+        user = getattr(self, user_attr)
+        self.client.force_authenticate(user=user)
+
+        response = self.client.patch(url, {"name": "new name"}, format="json")
+        assert response.status_code in expected_status, reason
+
+        # If we were able to patch the taxonomy, check if the name changed
+        if status.is_success(response.status_code):
+            response = self.client.get(url)
+            check_taxonomy(
+                response.data,
+                response.data["id"],
+                **{
+                    "name": "new name",
+                    "description": taxonomy.description,
+                    "enabled": taxonomy.enabled,
+                },
+            )
+
+
+@skip_unless_cms
+class TestTaxonomyDeleteViewSet(TestTaxonomyChangeMixin, APITestCase):
+    """
+    Test cases for TaxonomyViewSet with DELETE method
+    """
+
+    def _test_api_call(self, **kwargs) -> None:
+        user_attr = kwargs.get("user_attr")
+        taxonomy_attr = kwargs.get("taxonomy_attr")
+        expected_status = kwargs.get("expected_status")
+        reason = kwargs.get("reason", "Unexpected response status")
+
+        assert taxonomy_attr is not None, "taxonomy_attr is required"
+        assert user_attr is not None, "user_attr is required"
+        assert expected_status is not None, "expected_status is required"
+
+        taxonomy = getattr(self, taxonomy_attr)
+
+        url = TAXONOMY_ORG_DETAIL_URL.format(pk=taxonomy.pk)
+
+        user = getattr(self, user_attr)
+        self.client.force_authenticate(user=user)
+
+        response = self.client.delete(url)
+        assert response.status_code in expected_status, reason
+
+        # If we were able to delete the taxonomy, check that it's really gone
+        if status.is_success(response.status_code):
+            response = self.client.get(url)
+            assert response.status_code == status.HTTP_404_NOT_FOUND
+
+
+@skip_unless_cms
+@ddt.ddt
+class TestTaxonomyUpdateOrg(TestTaxonomyObjectsMixin, APITestCase):
+    """
+    Test cases for updating orgs from taxonomies
+    """
+
+    def test_update_org(self) -> None:
+        """
+        Tests that taxonomy admin can add/remove orgs from a taxonomy
+        """
+        url = TAXONOMY_ORG_UPDATE_ORG_URL.format(pk=self.tA1.pk)
+        self.client.force_authenticate(user=self.staff)
+
+        response = self.client.put(url, {"orgs": [self.orgB.short_name, self.orgX.short_name]}, format="json")
+        assert response.status_code == status.HTTP_200_OK
+
+        # Check that the orgs were updated
+        url = TAXONOMY_ORG_DETAIL_URL.format(pk=self.tA1.pk)
+        response = self.client.get(url)
+        assert response.data["orgs"] == [self.orgB.short_name, self.orgX.short_name]
+        assert not response.data["all_orgs"]
+
+    def test_update_all_org(self) -> None:
+        """
+        Tests that taxonomy admin can associate a taxonomy to all orgs
+        """
+        url = TAXONOMY_ORG_UPDATE_ORG_URL.format(pk=self.tA1.pk)
+        self.client.force_authenticate(user=self.staff)
+
+        response = self.client.put(url, {"all_orgs": True}, format="json")
+        assert response.status_code == status.HTTP_200_OK
+
+        # Check that the orgs were updated
+        url = TAXONOMY_ORG_DETAIL_URL.format(pk=self.tA1.pk)
+        response = self.client.get(url)
+        assert response.data["orgs"] == []
+        assert response.data["all_orgs"]
+
+    def test_update_no_org(self) -> None:
+        """
+        Tests that taxonomy admin can associate a taxonomy no orgs
+        """
+        url = TAXONOMY_ORG_UPDATE_ORG_URL.format(pk=self.tA1.pk)
+        self.client.force_authenticate(user=self.staff)
+
+        response = self.client.put(url, {"orgs": []}, format="json")
+
+        assert response.status_code == status.HTTP_200_OK
+
+        # Check that the orgs were updated
+        url = TAXONOMY_ORG_DETAIL_URL.format(pk=self.tA1.pk)
+        response = self.client.get(url)
+        assert response.data["orgs"] == []
+        assert not response.data["all_orgs"]
+
+    @ddt.data(
+        (True, ["orgX"], "Using both all_orgs and orgs parameters should throw error"),
+        (False, None, "Using neither all_orgs or orgs parameter should throw error"),
+        (None, None, "Using neither all_orgs or orgs parameter should throw error"),
+        (False, 'InvalidOrg', "Passing an invalid org should throw error"),
+    )
+    @ddt.unpack
+    def test_update_org_invalid_inputs(self, all_orgs: bool, orgs: list[str], reason: str) -> None:
+        """
+        Tests if passing both or none of all_orgs and orgs parameters throws error
+        """
+        url = TAXONOMY_ORG_UPDATE_ORG_URL.format(pk=self.tA1.pk)
+        self.client.force_authenticate(user=self.staff)
+
+        # Set body cleaning empty values
+        body = {k: v for k, v in {"all_orgs": all_orgs, "orgs": orgs}.items() if v is not None}
+        response = self.client.put(url, body, format="json")
+        assert response.status_code == status.HTTP_400_BAD_REQUEST, reason
+
+        # Check that the orgs didn't change
+        url = TAXONOMY_ORG_DETAIL_URL.format(pk=self.tA1.pk)
+        response = self.client.get(url)
+        assert response.data["orgs"] == [self.orgA.short_name]
+
+    def test_update_org_system_defined(self) -> None:
+        """
+        Tests that is not possible to change the orgs associated with a system defined taxonomy
+        """
+        url = TAXONOMY_ORG_UPDATE_ORG_URL.format(pk=self.st1.pk)
+        self.client.force_authenticate(user=self.staff)
+
+        response = self.client.put(url, {"orgs": [self.orgA.short_name]}, format="json")
+        assert response.status_code in [status.HTTP_403_FORBIDDEN, status.HTTP_400_BAD_REQUEST]
+
+        # Check that the orgs didn't change
+        url = TAXONOMY_ORG_DETAIL_URL.format(pk=self.st1.pk)
+        response = self.client.get(url)
+        assert response.data["orgs"] == []
+        assert response.data["all_orgs"]
+
+    @ddt.data(
+        "staffA",
+        "content_creatorA",
+        "instructorA",
+        "library_staffA",
+        "course_instructorA",
+        "course_staffA",
+        "library_userA",
+    )
+    def test_update_org_no_perm(self, user_attr: str) -> None:
+        """
+        Tests that only taxonomy admins can associate orgs to taxonomies
+        """
+        url = TAXONOMY_ORG_UPDATE_ORG_URL.format(pk=self.tA1.pk)
+        user = getattr(self, user_attr)
+        self.client.force_authenticate(user=user)
+
+        response = self.client.put(url, {"orgs": []}, format="json")
+        assert response.status_code == status.HTTP_403_FORBIDDEN
+
+        # Check that the orgs didn't change
+        url = TAXONOMY_ORG_DETAIL_URL.format(pk=self.tA1.pk)
+        response = self.client.get(url)
+        assert response.data["orgs"] == [self.orgA.short_name]
+
+    def test_update_org_check_permissions_orgA(self) -> None:
+        """
+        Tests that adding an org to a taxonomy allow org level admins to edit it
+        """
+        url = TAXONOMY_ORG_DETAIL_URL.format(pk=self.tB1.pk)
+        self.client.force_authenticate(user=self.staffA)
+
+        response = self.client.put(url, {"name": "new name"}, format="json")
+
+        # User staffA can't update metadata from a taxonomy from orgB
+        assert response.status_code == status.HTTP_404_NOT_FOUND
+
+        url = TAXONOMY_ORG_UPDATE_ORG_URL.format(pk=self.tB1.pk)
+        self.client.force_authenticate(user=self.staff)
+
+        # Add the taxonomy tB1 to orgA
+        response = self.client.put(url, {"orgs": [self.orgA.short_name]}, format="json")
+
+        url = TAXONOMY_ORG_DETAIL_URL.format(pk=self.tB1.pk)
+        self.client.force_authenticate(user=self.staffA)
+
+        response = self.client.put(url, {"name": "new name"}, format="json")
+
+        # Now staffA can change the metadata from a tB1 because it's associated with orgA
+        assert response.status_code == status.HTTP_200_OK
+
+    def test_update_org_check_permissions_all_orgs(self) -> None:
+        """
+        Tests that adding an org to all orgs only let taxonomy global admins to edit it
+        """
+        url = TAXONOMY_ORG_DETAIL_URL.format(pk=self.tA1.pk)
+        self.client.force_authenticate(user=self.staffA)
+
+        response = self.client.put(url, {"name": "new name"}, format="json")
+
+        # User staffA can update metadata from a taxonomy from orgA
+        assert response.status_code == status.HTTP_200_OK
+
+        url = TAXONOMY_ORG_UPDATE_ORG_URL.format(pk=self.tB1.pk)
+        self.client.force_authenticate(user=self.staff)
+
+        # Add the taxonomy tA1 to all orgs
+        response = self.client.put(url, {"all_orgs": True}, format="json")
+
+        url = TAXONOMY_ORG_DETAIL_URL.format(pk=self.tB1.pk)
+        self.client.force_authenticate(user=self.staffA)
+
+        response = self.client.put(url, {"name": "new name"}, format="json")
+
+        # Now staffA can't change the metadata from a tA1 because only global taxonomy admins can edit all orgs
+        # taxonomies
+        assert response.status_code == status.HTTP_403_FORBIDDEN
+
+    def test_update_org_check_permissions_no_orgs(self) -> None:
+        """
+        Tests that remove all orgs from a taxonomy only let taxonomy global admins to edit it
+        """
+        url = TAXONOMY_ORG_DETAIL_URL.format(pk=self.tA1.pk)
+        self.client.force_authenticate(user=self.staffA)
+
+        response = self.client.put(url, {"name": "new name"}, format="json")
+
+        # User staffA can update metadata from a taxonomy from orgA
+        assert response.status_code == status.HTTP_200_OK
+
+        url = TAXONOMY_ORG_UPDATE_ORG_URL.format(pk=self.tB1.pk)
+        self.client.force_authenticate(user=self.staff)
+
+        # Remove all orgs from tA1
+        response = self.client.put(url, {"orgs": []}, format="json")
+
+        url = TAXONOMY_ORG_DETAIL_URL.format(pk=self.tB1.pk)
+        self.client.force_authenticate(user=self.staffA)
+
+        response = self.client.put(url, {"name": "new name"}, format="json")
+
+        # Now staffA can't change the metadata from a tA1 because only global taxonomy admins can edit no orgs
+        # taxonomies
+        assert response.status_code == status.HTTP_404_NOT_FOUND
+
+
+class TestObjectTagMixin(TestTaxonomyObjectsMixin):
+    """
+    Sets up data for testing ObjectTags.
+    """
+    def setUp(self):
+        """
+        Setup the test cases
+        """
+        super().setUp()
+        self.xblockA = BlockUsageLocator(
+            course_key=self.courseA,
+            block_type='problem',
+            block_id='block_id'
+        )
+        self.xblockB = BlockUsageLocator(
+            course_key=self.courseB,
+            block_type='problem',
+            block_id='block_id'
+        )
+
+        self.multiple_taxonomy = Taxonomy.objects.create(name="Multiple Taxonomy", allow_multiple=True)
+        self.single_value_taxonomy = Taxonomy.objects.create(name="Required Taxonomy", allow_multiple=False)
+        for i in range(20):
             # Valid ObjectTags
             Tag.objects.create(taxonomy=self.tA1, value=f"Tag {i}")
             Tag.objects.create(taxonomy=self.tA2, value=f"Tag {i}")
@@ -691,37 +1288,41 @@ def setUp(self):
             rel_type=TaxonomyOrg.RelType.OWNER,
         )
 
-        add_users(self.userS, CourseStaffRole(self.courseA), self.userA)
+        add_users(self.staff, CourseStaffRole(self.courseA), self.staffA)
+
+
+@skip_unless_cms
+@ddt.ddt
+class TestObjectTagViewSet(TestObjectTagMixin, APITestCase):
+    """
+    Testing various cases for the ObjectTagView.
+    """
+
+    def test_get_tags(self):
+        pass
 
     @ddt.data(
         # userA and userS are staff in courseA and can tag using enabled taxonomies
-        (None, "tA1", ["Tag 1"], status.HTTP_403_FORBIDDEN),
         ("user", "tA1", ["Tag 1"], status.HTTP_403_FORBIDDEN),
-        ("userA", "tA1", ["Tag 1"], status.HTTP_200_OK),
-        ("userS", "tA1", ["Tag 1"], status.HTTP_200_OK),
-        (None, "tA1", [], status.HTTP_403_FORBIDDEN),
+        ("staffA", "tA1", ["Tag 1"], status.HTTP_200_OK),
+        ("staff", "tA1", ["Tag 1"], status.HTTP_200_OK),
         ("user", "tA1", [], status.HTTP_403_FORBIDDEN),
-        ("userA", "tA1", [], status.HTTP_200_OK),
-        ("userS", "tA1", [], status.HTTP_200_OK),
-        (None, "multiple_taxonomy", ["Tag 1", "Tag 2"], status.HTTP_403_FORBIDDEN),
+        ("staffA", "tA1", [], status.HTTP_200_OK),
+        ("staff", "tA1", [], status.HTTP_200_OK),
         ("user", "multiple_taxonomy", ["Tag 1", "Tag 2"], status.HTTP_403_FORBIDDEN),
-        ("userA", "multiple_taxonomy", ["Tag 1", "Tag 2"], status.HTTP_200_OK),
-        ("userS", "multiple_taxonomy", ["Tag 1", "Tag 2"], status.HTTP_200_OK),
-        (None, "open_taxonomy", ["tag1"], status.HTTP_403_FORBIDDEN),
+        ("staffA", "multiple_taxonomy", ["Tag 1", "Tag 2"], status.HTTP_200_OK),
+        ("staff", "multiple_taxonomy", ["Tag 1", "Tag 2"], status.HTTP_200_OK),
         ("user", "open_taxonomy", ["tag1"], status.HTTP_403_FORBIDDEN),
-        ("userA", "open_taxonomy", ["tag1"], status.HTTP_200_OK),
-        ("userS", "open_taxonomy", ["tag1"], status.HTTP_200_OK),
-        # Only userS is Tagging Admin and can tag objects using disabled taxonomies
-        (None, "tA2", ["Tag 1"], status.HTTP_403_FORBIDDEN),
-        ("user", "tA2", ["Tag 1"], status.HTTP_403_FORBIDDEN),
-        ("userA", "tA2", ["Tag 1"], status.HTTP_403_FORBIDDEN),
-        ("userS", "tA2", ["Tag 1"], status.HTTP_200_OK),
+        ("staffA", "open_taxonomy", ["tag1"], status.HTTP_200_OK),
+        ("staff", "open_taxonomy", ["tag1"], status.HTTP_200_OK),
     )
     @ddt.unpack
     def test_tag_course(self, user_attr, taxonomy_attr, tag_values, expected_status):
-        if user_attr:
-            user = getattr(self, user_attr)
-            self.client.force_authenticate(user=user)
+        """
+        Tests that only staff and org level users can tag courses
+        """
+        user = getattr(self, user_attr)
+        self.client.force_authenticate(user=user)
 
         taxonomy = getattr(self, taxonomy_attr)
 
@@ -731,65 +1332,81 @@ def test_tag_course(self, user_attr, taxonomy_attr, tag_values, expected_status)
 
         assert response.status_code == expected_status
         if status.is_success(expected_status):
-            assert len(response.data) == len(tag_values)
-            assert set(t["value"] for t in response.data) == set(tag_values)
-
-    @ddt.data(
-        # Can't add invalid tags to a object using a closed taxonomy
-        (None, "tA1", ["invalid"], status.HTTP_403_FORBIDDEN),
-        ("user", "tA1", ["invalid"], status.HTTP_403_FORBIDDEN),
-        ("userA", "tA1", ["invalid"], status.HTTP_400_BAD_REQUEST),
-        ("userS", "tA1", ["invalid"], status.HTTP_400_BAD_REQUEST),
-        (None, "multiple_taxonomy", ["invalid"], status.HTTP_403_FORBIDDEN),
-        ("user", "multiple_taxonomy", ["invalid"], status.HTTP_403_FORBIDDEN),
-        ("userA", "multiple_taxonomy", ["invalid"], status.HTTP_400_BAD_REQUEST),
-        ("userS", "multiple_taxonomy", ["invalid"], status.HTTP_400_BAD_REQUEST),
-        # Staff can't add invalid tags to a object using a closed taxonomy
-        ("userS", "tA2", ["invalid"], status.HTTP_400_BAD_REQUEST),
+            tags_by_taxonomy = response.data[str(self.courseA)]["taxonomies"]
+            if tag_values:
+                response_taxonomy = tags_by_taxonomy[0]
+                assert response_taxonomy["name"] == taxonomy.name
+                response_tags = response_taxonomy["tags"]
+                assert [t["value"] for t in response_tags] == tag_values
+            else:
+                assert tags_by_taxonomy == []  # No tags are set from any taxonomy
+
+            # Check that re-fetching the tags returns what we set
+            new_response = self.client.get(url, format="json")
+            assert status.is_success(new_response.status_code)
+            assert new_response.data == response.data
+
+    @ddt.data(
+        "staffA",
+        "staff",
+    )
+    def test_tag_course_disabled_taxonomy(self, user_attr):
+        """
+        Nobody can use disable taxonomies to tag objects
+        """
+        user = getattr(self, user_attr)
+        self.client.force_authenticate(user=user)
+
+        disabled_taxonomy = self.tA2
+        assert disabled_taxonomy.enabled is False
+
+        url = OBJECT_TAG_UPDATE_URL.format(object_id=self.courseA, taxonomy_id=disabled_taxonomy.pk)
+        response = self.client.put(url, {"tags": ["Tag 1"]}, format="json")
+
+        assert response.status_code == status.HTTP_403_FORBIDDEN
+
+    @ddt.data(
+        ("staffA", "tA1"),
+        ("staff", "tA1"),
+        ("staffA", "multiple_taxonomy"),
+        ("staff", "multiple_taxonomy"),
     )
     @ddt.unpack
-    def test_tag_course_invalid(self, user_attr, taxonomy_attr, tag_values, expected_status):
-        if user_attr:
-            user = getattr(self, user_attr)
-            self.client.force_authenticate(user=user)
+    def test_tag_course_invalid(self, user_attr, taxonomy_attr):
+        """
+        Tests that nobody can add invalid tags to a course using a closed taxonomy
+        """
+        user = getattr(self, user_attr)
+        self.client.force_authenticate(user=user)
 
         taxonomy = getattr(self, taxonomy_attr)
 
         url = OBJECT_TAG_UPDATE_URL.format(object_id=self.courseA, taxonomy_id=taxonomy.pk)
 
-        response = self.client.put(url, {"tags": tag_values}, format="json")
-        assert response.status_code == expected_status
-        assert not status.is_success(expected_status)  # No success cases here
+        response = self.client.put(url, {"tags": ["invalid"]}, format="json")
+        assert response.status_code == status.HTTP_400_BAD_REQUEST
 
     @ddt.data(
-        # userA and userS are staff in courseA (owner of xblockA) and can tag using enabled taxonomies
-        (None, "tA1", ["Tag 1"], status.HTTP_403_FORBIDDEN),
+        # userA and userS are staff in courseA (owner of xblockA) and can tag using any taxonomies
         ("user", "tA1", ["Tag 1"], status.HTTP_403_FORBIDDEN),
-        ("userA", "tA1", ["Tag 1"], status.HTTP_200_OK),
-        ("userS", "tA1", ["Tag 1"], status.HTTP_200_OK),
-        (None, "tA1", [], status.HTTP_403_FORBIDDEN),
-        ("user", "tA1", [], status.HTTP_403_FORBIDDEN),
-        ("userA", "tA1", [], status.HTTP_200_OK),
-        ("userS", "tA1", [], status.HTTP_200_OK),
-        (None, "multiple_taxonomy", ["Tag 1", "Tag 2"], status.HTTP_403_FORBIDDEN),
+        ("staffA", "tA1", ["Tag 1"], status.HTTP_200_OK),
+        ("staff", "tA1", ["Tag 1"], status.HTTP_200_OK),
         ("user", "multiple_taxonomy", ["Tag 1", "Tag 2"], status.HTTP_403_FORBIDDEN),
-        ("userA", "multiple_taxonomy", ["Tag 1", "Tag 2"], status.HTTP_200_OK),
-        ("userS", "multiple_taxonomy", ["Tag 1", "Tag 2"], status.HTTP_200_OK),
-        (None, "open_taxonomy", ["tag1"], status.HTTP_403_FORBIDDEN),
+        ("staffA", "tA1", [], status.HTTP_200_OK),
+        ("staff", "tA1", [], status.HTTP_200_OK),
+        ("staffA", "multiple_taxonomy", ["Tag 1", "Tag 2"], status.HTTP_200_OK),
+        ("staff", "multiple_taxonomy", ["Tag 1", "Tag 2"], status.HTTP_200_OK),
         ("user", "open_taxonomy", ["tag1"], status.HTTP_403_FORBIDDEN),
-        ("userA", "open_taxonomy", ["tag1"], status.HTTP_200_OK),
-        ("userS", "open_taxonomy", ["tag1"], status.HTTP_200_OK),
-        # Only userS is Tagging Admin and can tag objects using disabled taxonomies
-        (None, "tA2", ["Tag 1"], status.HTTP_403_FORBIDDEN),
-        ("user", "tA2", ["Tag 1"], status.HTTP_403_FORBIDDEN),
-        ("userA", "tA2", ["Tag 1"], status.HTTP_403_FORBIDDEN),
-        ("userS", "tA2", ["Tag 1"], status.HTTP_200_OK),
+        ("staffA", "open_taxonomy", ["tag1"], status.HTTP_200_OK),
+        ("staff", "open_taxonomy", ["tag1"], status.HTTP_200_OK),
     )
     @ddt.unpack
     def test_tag_xblock(self, user_attr, taxonomy_attr, tag_values, expected_status):
-        if user_attr:
-            user = getattr(self, user_attr)
-            self.client.force_authenticate(user=user)
+        """
+        Tests that only staff and org level users can tag xblocks
+        """
+        user = getattr(self, user_attr)
+        self.client.force_authenticate(user=user)
 
         taxonomy = getattr(self, taxonomy_attr)
 
@@ -799,45 +1416,69 @@ def test_tag_xblock(self, user_attr, taxonomy_attr, tag_values, expected_status)
 
         assert response.status_code == expected_status
         if status.is_success(expected_status):
-            assert len(response.data) == len(tag_values)
-            assert set(t["value"] for t in response.data) == set(tag_values)
-
-    @ddt.data(
-        # Can't add invalid tags to a object using a closed taxonomy
-        (None, "tA1", ["invalid"], status.HTTP_403_FORBIDDEN),
-        ("user", "tA1", ["invalid"], status.HTTP_403_FORBIDDEN),
-        ("userA", "tA1", ["invalid"], status.HTTP_400_BAD_REQUEST),
-        ("userS", "tA1", ["invalid"], status.HTTP_400_BAD_REQUEST),
-        (None, "multiple_taxonomy", ["invalid"], status.HTTP_403_FORBIDDEN),
-        ("user", "multiple_taxonomy", ["invalid"], status.HTTP_403_FORBIDDEN),
-        ("userA", "multiple_taxonomy", ["invalid"], status.HTTP_400_BAD_REQUEST),
-        ("userS", "multiple_taxonomy", ["invalid"], status.HTTP_400_BAD_REQUEST),
-        # Staff can't add invalid tags to a object using a closed taxonomy
-        ("userS", "tA2", ["invalid"], status.HTTP_400_BAD_REQUEST),
+            tags_by_taxonomy = response.data[str(self.xblockA)]["taxonomies"]
+            if tag_values:
+                response_taxonomy = tags_by_taxonomy[0]
+                assert response_taxonomy["name"] == taxonomy.name
+                response_tags = response_taxonomy["tags"]
+                assert [t["value"] for t in response_tags] == tag_values
+            else:
+                assert tags_by_taxonomy == []  # No tags are set from any taxonomy
+
+            # Check that re-fetching the tags returns what we set
+            new_response = self.client.get(url, format="json")
+            assert status.is_success(new_response.status_code)
+            assert new_response.data == response.data
+
+    @ddt.data(
+        "staffA",
+        "staff",
+    )
+    def test_tag_xblock_disabled_taxonomy(self, user_attr):
+        """
+        Tests that nobody can use disabled taxonomies to tag xblocks
+        """
+        user = getattr(self, user_attr)
+        self.client.force_authenticate(user=user)
+
+        disabled_taxonomy = self.tA2
+        assert disabled_taxonomy.enabled is False
+
+        url = OBJECT_TAG_UPDATE_URL.format(object_id=self.xblockA, taxonomy_id=disabled_taxonomy.pk)
+        response = self.client.put(url, {"tags": ["Tag 1"]}, format="json")
+
+        assert response.status_code == status.HTTP_403_FORBIDDEN
+
+    @ddt.data(
+        ("staffA", "tA1"),
+        ("staff", "tA1"),
+        ("staffA", "multiple_taxonomy"),
+        ("staff", "multiple_taxonomy"),
     )
     @ddt.unpack
-    def test_tag_xblock_invalid(self, user_attr, taxonomy_attr, tag_values, expected_status):
-        if user_attr:
-            user = getattr(self, user_attr)
-            self.client.force_authenticate(user=user)
+    def test_tag_xblock_invalid(self, user_attr, taxonomy_attr):
+        """
+        Tests that staff can't add invalid tags to a xblock using a closed taxonomy
+        """
+        user = getattr(self, user_attr)
+        self.client.force_authenticate(user=user)
 
         taxonomy = getattr(self, taxonomy_attr)
 
         url = OBJECT_TAG_UPDATE_URL.format(object_id=self.xblockA, taxonomy_id=taxonomy.pk)
 
-        response = self.client.put(url, {"tags": tag_values}, format="json")
-        assert response.status_code == expected_status
-        assert not status.is_success(expected_status)  # No success cases here
+        response = self.client.put(url, {"tags": ["invalid"]}, format="json")
+        assert response.status_code == status.HTTP_400_BAD_REQUEST
 
     @ddt.data(
         "courseB",
         "xblockB",
     )
-    def test_tag_unauthorized(self, objectid_attr):
+    def test_tag_no_permission(self, objectid_attr):
         """
         Test that a user without access to courseB can't apply tags to it
         """
-        self.client.force_authenticate(user=self.userA)
+        self.client.force_authenticate(user=self.staffA)
         object_id = getattr(self, objectid_attr)
 
         url = OBJECT_TAG_UPDATE_URL.format(object_id=object_id, taxonomy_id=self.tA1.pk)
@@ -846,6 +1487,22 @@ def test_tag_unauthorized(self, objectid_attr):
 
         assert response.status_code == status.HTTP_403_FORBIDDEN
 
+    @ddt.data(
+        "courseB",
+        "xblockB",
+    )
+    def test_tag_unauthorized(self, objectid_attr):
+        """
+        Test that a user without access to courseB can't apply tags to it
+        """
+        object_id = getattr(self, objectid_attr)
+
+        url = OBJECT_TAG_UPDATE_URL.format(object_id=object_id, taxonomy_id=self.tA1.pk)
+
+        response = self.client.put(url, {"tags": ["Tag 1"]}, format="json")
+
+        assert response.status_code == status.HTTP_401_UNAUTHORIZED
+
 
 @skip_unless_cms
 @ddt.ddt
@@ -875,3 +1532,444 @@ def test_download_method_not_allowed(self):
         url = TAXONOMY_TEMPLATE_URL.format(filename="template.txt")
         response = self.client.post(url)
         assert response.status_code == status.HTTP_405_METHOD_NOT_ALLOWED
+
+
+class ImportTaxonomyMixin(TestTaxonomyObjectsMixin):
+    """
+    Mixin to test importing taxonomies.
+    """
+    def _get_file(self, tags: list, file_format: str) -> SimpleUploadedFile:
+        """
+        Returns a file for the given format.
+        """
+        if file_format == "csv":
+            csv_data = "id,value"
+            for tag in tags:
+                csv_data += f"\n{tag['id']},{tag['value']}"
+            return SimpleUploadedFile("taxonomy.csv", csv_data.encode(), content_type="text/csv")
+        else:  # json
+            json_data = {"tags": tags}
+            return SimpleUploadedFile("taxonomy.json", json.dumps(json_data).encode(), content_type="application/json")
+
+
+@skip_unless_cms
+@ddt.ddt
+class TestCreateImportView(ImportTaxonomyMixin, APITestCase):
+    """
+    Tests the create/import taxonomy action.
+    """
+    @ddt.data(
+        "csv",
+        "json",
+    )
+    def test_import_global_admin(self, file_format: str) -> None:
+        """
+        Tests importing a valid taxonomy file with a global admin.
+        """
+        url = TAXONOMY_CREATE_IMPORT_URL
+        new_tags = [
+            {"id": "tag_1", "value": "Tag 1"},
+            {"id": "tag_2", "value": "Tag 2"},
+            {"id": "tag_3", "value": "Tag 3"},
+            {"id": "tag_4", "value": "Tag 4"},
+        ]
+        file = self._get_file(new_tags, file_format)
+
+        self.client.force_authenticate(user=self.staff)
+        response = self.client.post(
+            url,
+            {
+                "taxonomy_name": "Imported Taxonomy name",
+                "taxonomy_description": "Imported Taxonomy description",
+                "file": file,
+            },
+            format="multipart"
+        )
+        assert response.status_code == status.HTTP_201_CREATED
+
+        # Check if the taxonomy was created
+        taxonomy = response.data
+        assert taxonomy["name"] == "Imported Taxonomy name"
+        assert taxonomy["description"] == "Imported Taxonomy description"
+
+        # Check if the tags were created
+        url = TAXONOMY_TAGS_URL.format(pk=taxonomy["id"])
+        response = self.client.get(url)
+        tags = response.data["results"]
+        assert len(tags) == len(new_tags)
+        for i, tag in enumerate(tags):
+            assert tag["value"] == new_tags[i]["value"]
+
+        # Check if the taxonomy was no association with orgs
+        assert len(taxonomy["orgs"]) == 0
+
+    @ddt.data(
+        "csv",
+        "json",
+    )
+    def test_import_orgA_admin(self, file_format: str) -> None:
+        """
+        Tests importing a valid taxonomy file with a orgA admin.
+        """
+        url = TAXONOMY_CREATE_IMPORT_URL
+        new_tags = [
+            {"id": "tag_1", "value": "Tag 1"},
+            {"id": "tag_2", "value": "Tag 2"},
+            {"id": "tag_3", "value": "Tag 3"},
+            {"id": "tag_4", "value": "Tag 4"},
+        ]
+        file = self._get_file(new_tags, file_format)
+
+        self.client.force_authenticate(user=self.staffA)
+        response = self.client.post(
+            url,
+            {
+                "taxonomy_name": "Imported Taxonomy name",
+                "taxonomy_description": "Imported Taxonomy description",
+                "file": file,
+            },
+            format="multipart"
+        )
+        assert response.status_code == status.HTTP_201_CREATED
+
+        # Check if the taxonomy was created
+        taxonomy = response.data
+        assert taxonomy["name"] == "Imported Taxonomy name"
+        assert taxonomy["description"] == "Imported Taxonomy description"
+
+        # Check if the tags were created
+        url = TAXONOMY_TAGS_URL.format(pk=taxonomy["id"])
+        response = self.client.get(url)
+        tags = response.data["results"]
+        assert len(tags) == len(new_tags)
+        for i, tag in enumerate(tags):
+            assert tag["value"] == new_tags[i]["value"]
+
+        # Check if the taxonomy was associated with the orgA
+        assert len(taxonomy["orgs"]) == 1
+        assert taxonomy["orgs"][0] == self.orgA.short_name
+
+    def test_import_no_file(self) -> None:
+        """
+        Tests importing a taxonomy without a file.
+        """
+        url = TAXONOMY_CREATE_IMPORT_URL
+        self.client.force_authenticate(user=self.staff)
+        response = self.client.post(
+            url,
+            {
+                "taxonomy_name": "Imported Taxonomy name",
+                "taxonomy_description": "Imported Taxonomy description",
+            },
+            format="multipart"
+        )
+        assert response.status_code == status.HTTP_400_BAD_REQUEST
+        assert response.data["file"][0] == "No file was submitted."
+
+        # Check if the taxonomy was not created
+        assert not Taxonomy.objects.filter(name="Imported Taxonomy name").exists()
+
+    @ddt.data(
+        "csv",
+        "json",
+    )
+    def test_import_no_name(self, file_format) -> None:
+        """
+        Tests importing a taxonomy without specifing a name.
+        """
+        url = TAXONOMY_CREATE_IMPORT_URL
+        file = SimpleUploadedFile(f"taxonomy.{file_format}", b"invalid file content")
+        self.client.force_authenticate(user=self.staff)
+        response = self.client.post(
+            url,
+            {
+                "taxonomy_description": "Imported Taxonomy description",
+                "file": file,
+            },
+            format="multipart"
+        )
+        assert response.status_code == status.HTTP_400_BAD_REQUEST
+        assert response.data["taxonomy_name"][0] == "This field is required."
+
+        # Check if the taxonomy was not created
+        assert not Taxonomy.objects.filter(name="Imported Taxonomy name").exists()
+
+    def test_import_invalid_format(self) -> None:
+        """
+        Tests importing a taxonomy with an invalid file format.
+        """
+        url = TAXONOMY_CREATE_IMPORT_URL
+        file = SimpleUploadedFile("taxonomy.invalid", b"invalid file content")
+        self.client.force_authenticate(user=self.staff)
+        response = self.client.post(
+            url,
+            {
+                "taxonomy_name": "Imported Taxonomy name",
+                "taxonomy_description": "Imported Taxonomy description",
+                "file": file,
+            },
+            format="multipart"
+        )
+        assert response.status_code == status.HTTP_400_BAD_REQUEST
+        assert response.data["file"][0] == "File type not supported: invalid"
+
+        # Check if the taxonomy was not created
+        assert not Taxonomy.objects.filter(name="Imported Taxonomy name").exists()
+
+    @ddt.data(
+        "csv",
+        "json",
+    )
+    def test_import_invalid_content(self, file_format) -> None:
+        """
+        Tests importing a taxonomy with an invalid file content.
+        """
+        url = TAXONOMY_CREATE_IMPORT_URL
+        file = SimpleUploadedFile(f"taxonomy.{file_format}", b"invalid file content")
+        self.client.force_authenticate(user=self.staff)
+        response = self.client.post(
+            url,
+            {
+                "taxonomy_name": "Imported Taxonomy name",
+                "taxonomy_description": "Imported Taxonomy description",
+                "file": file,
+            },
+            format="multipart"
+        )
+        assert response.status_code == status.HTTP_400_BAD_REQUEST
+        assert f"Invalid '.{file_format}' format:" in response.data
+
+        # Check if the taxonomy was not created
+        assert not Taxonomy.objects.filter(name="Imported Taxonomy name").exists()
+
+    def test_import_no_perm(self) -> None:
+        """
+        Tests importing a taxonomy using a user without permission.
+        """
+        url = TAXONOMY_CREATE_IMPORT_URL
+        new_tags = [
+            {"id": "tag_1", "value": "Tag 1"},
+            {"id": "tag_2", "value": "Tag 2"},
+            {"id": "tag_3", "value": "Tag 3"},
+            {"id": "tag_4", "value": "Tag 4"},
+        ]
+        file = self._get_file(new_tags, "json")
+
+        self.client.force_authenticate(user=self.user)
+        response = self.client.post(
+            url,
+            {
+                "taxonomy_name": "Imported Taxonomy name",
+                "taxonomy_description": "Imported Taxonomy description",
+                "file": file,
+            },
+            format="multipart"
+        )
+        assert response.status_code == status.HTTP_403_FORBIDDEN
+
+        # Check if the taxonomy was not created
+        assert not Taxonomy.objects.filter(name="Imported Taxonomy name").exists()
+
+
+@skip_unless_cms
+@ddt.ddt
+class TestImportTagsView(ImportTaxonomyMixin, APITestCase):
+    """
+    Tests the taxonomy import tags action.
+    """
+    def setUp(self):
+        ImportTaxonomyMixin.setUp(self)
+
+        self.taxonomy = Taxonomy.objects.create(
+            name="Test import taxonomy",
+        )
+        tag_1 = Tag.objects.create(
+            taxonomy=self.taxonomy,
+            external_id="old_tag_1",
+            value="Old tag 1",
+        )
+        tag_2 = Tag.objects.create(
+            taxonomy=self.taxonomy,
+            external_id="old_tag_2",
+            value="Old tag 2",
+        )
+        self.old_tags = [tag_1, tag_2]
+
+    @ddt.data(
+        "csv",
+        "json",
+    )
+    def test_import(self, file_format: str) -> None:
+        """
+        Tests importing a valid taxonomy file.
+        """
+        url = TAXONOMY_TAGS_IMPORT_URL.format(pk=self.taxonomy.id)
+        new_tags = [
+            {"id": "tag_1", "value": "Tag 1"},
+            {"id": "tag_2", "value": "Tag 2"},
+            {"id": "tag_3", "value": "Tag 3"},
+            {"id": "tag_4", "value": "Tag 4"},
+        ]
+        file = self._get_file(new_tags, file_format)
+
+        self.client.force_authenticate(user=self.staff)
+        response = self.client.put(
+            url,
+            {"file": file},
+            format="multipart"
+        )
+        assert response.status_code == status.HTTP_200_OK
+
+        # Check if the tags were created
+        url = TAXONOMY_TAGS_URL.format(pk=self.taxonomy.id)
+        response = self.client.get(url)
+        tags = response.data["results"]
+        all_tags = [{"value": tag.value} for tag in self.old_tags] + new_tags
+        assert len(tags) == len(all_tags)
+        for i, tag in enumerate(tags):
+            assert tag["value"] == all_tags[i]["value"]
+
+    def test_import_no_file(self) -> None:
+        """
+        Tests importing a taxonomy without a file.
+        """
+        url = TAXONOMY_TAGS_IMPORT_URL.format(pk=self.taxonomy.id)
+        self.client.force_authenticate(user=self.staff)
+        response = self.client.put(
+            url,
+            {},
+            format="multipart"
+        )
+        assert response.status_code == status.HTTP_400_BAD_REQUEST
+        assert response.data["file"][0] == "No file was submitted."
+
+        # Check if the taxonomy was not changed
+        url = TAXONOMY_TAGS_URL.format(pk=self.taxonomy.id)
+        response = self.client.get(url)
+        tags = response.data["results"]
+        assert len(tags) == len(self.old_tags)
+        for i, tag in enumerate(tags):
+            assert tag["value"] == self.old_tags[i].value
+
+    def test_import_invalid_format(self) -> None:
+        """
+        Tests importing a taxonomy with an invalid file format.
+        """
+        url = TAXONOMY_TAGS_IMPORT_URL.format(pk=self.taxonomy.id)
+        file = SimpleUploadedFile("taxonomy.invalid", b"invalid file content")
+        self.client.force_authenticate(user=self.staff)
+        response = self.client.put(
+            url,
+            {"file": file},
+            format="multipart"
+        )
+        assert response.status_code == status.HTTP_400_BAD_REQUEST
+        assert response.data["file"][0] == "File type not supported: invalid"
+
+        # Check if the taxonomy was not changed
+        url = TAXONOMY_TAGS_URL.format(pk=self.taxonomy.id)
+        response = self.client.get(url)
+        tags = response.data["results"]
+        assert len(tags) == len(self.old_tags)
+        for i, tag in enumerate(tags):
+            assert tag["value"] == self.old_tags[i].value
+
+    @ddt.data(
+        "csv",
+        "json",
+    )
+    def test_import_invalid_content(self, file_format) -> None:
+        """
+        Tests importing a taxonomy with an invalid file content.
+        """
+        url = TAXONOMY_TAGS_IMPORT_URL.format(pk=self.taxonomy.id)
+        file = SimpleUploadedFile(f"taxonomy.{file_format}", b"invalid file content")
+        self.client.force_authenticate(user=self.staff)
+        response = self.client.put(
+            url,
+            {
+                "taxonomy_name": "Imported Taxonomy name",
+                "taxonomy_description": "Imported Taxonomy description",
+                "file": file,
+            },
+            format="multipart"
+        )
+        assert response.status_code == status.HTTP_400_BAD_REQUEST
+        assert f"Invalid '.{file_format}' format:" in response.data
+
+        # Check if the taxonomy was not changed
+        url = TAXONOMY_TAGS_URL.format(pk=self.taxonomy.id)
+        response = self.client.get(url)
+        tags = response.data["results"]
+        assert len(tags) == len(self.old_tags)
+        for i, tag in enumerate(tags):
+            assert tag["value"] == self.old_tags[i].value
+
+    @ddt.data(
+        "csv",
+        "json",
+    )
+    def test_import_free_text(self, file_format) -> None:
+        """
+        Tests importing a taxonomy with an invalid file content.
+        """
+        self.taxonomy.allow_free_text = True
+        self.taxonomy.save()
+        url = TAXONOMY_TAGS_IMPORT_URL.format(pk=self.taxonomy.id)
+        new_tags = [
+            {"id": "tag_1", "value": "Tag 1"},
+            {"id": "tag_2", "value": "Tag 2"},
+            {"id": "tag_3", "value": "Tag 3"},
+            {"id": "tag_4", "value": "Tag 4"},
+        ]
+        file = self._get_file(new_tags, file_format)
+
+        self.client.force_authenticate(user=self.staff)
+        response = self.client.put(
+            url,
+            {"file": file},
+            format="multipart"
+        )
+
+        assert response.status_code == status.HTTP_400_BAD_REQUEST
+        assert response.data == f"Invalid taxonomy ({self.taxonomy.id}): You cannot import a free-form taxonomy."
+
+        # Check if the taxonomy has no tags, since it is free text
+        url = TAXONOMY_TAGS_URL.format(pk=self.taxonomy.id)
+        response = self.client.get(url)
+        tags = response.data["results"]
+        assert len(tags) == 0
+
+    def test_import_no_perm(self) -> None:
+        """
+        Tests importing a taxonomy using a user without permission.
+        """
+        url = TAXONOMY_TAGS_IMPORT_URL.format(pk=self.taxonomy.id)
+        new_tags = [
+            {"id": "tag_1", "value": "Tag 1"},
+            {"id": "tag_2", "value": "Tag 2"},
+            {"id": "tag_3", "value": "Tag 3"},
+            {"id": "tag_4", "value": "Tag 4"},
+        ]
+        file = self._get_file(new_tags, "json")
+
+        self.client.force_authenticate(user=self.user)
+        response = self.client.put(
+            url,
+            {
+                "taxonomy_name": "Imported Taxonomy name",
+                "taxonomy_description": "Imported Taxonomy description",
+                "file": file,
+            },
+            format="multipart"
+        )
+        assert response.status_code == status.HTTP_404_NOT_FOUND
+
+        # Check if the taxonomy was not changed
+        url = TAXONOMY_TAGS_URL.format(pk=self.taxonomy.id)
+        self.client.force_authenticate(user=self.staff)
+        response = self.client.get(url)
+        tags = response.data["results"]
+        assert len(tags) == len(self.old_tags)
+        for i, tag in enumerate(tags):
+            assert tag["value"] == self.old_tags[i].value
diff --git a/openedx/core/djangoapps/content_tagging/rest_api/v1/urls.py b/openedx/core/djangoapps/content_tagging/rest_api/v1/urls.py
index d6fc047e5288..53addf281ce8 100644
--- a/openedx/core/djangoapps/content_tagging/rest_api/v1/urls.py
+++ b/openedx/core/djangoapps/content_tagging/rest_api/v1/urls.py
@@ -15,9 +15,14 @@
 
 router = DefaultRouter()
 router.register("taxonomies", views.TaxonomyOrgView, basename="taxonomy")
-router.register("object_tags", oel_tagging_views.ObjectTagView, basename="object_tag")
+router.register("object_tags", views.ObjectTagOrgView, basename="object_tag")
 
 urlpatterns = [
+    path(
+        "taxonomies/<str:pk>/tags/",
+        oel_tagging_views.TaxonomyTagsView.as_view(),
+        name="taxonomy-tags",
+    ),
     path(
         "taxonomies/import/template.<str:file_ext>",
         oel_tagging_views_import.TemplateView.as_view(),
diff --git a/openedx/core/djangoapps/content_tagging/rest_api/v1/views.py b/openedx/core/djangoapps/content_tagging/rest_api/v1/views.py
index 7bdfe7cd3961..a38aab8e01cb 100644
--- a/openedx/core/djangoapps/content_tagging/rest_api/v1/views.py
+++ b/openedx/core/djangoapps/content_tagging/rest_api/v1/views.py
@@ -1,22 +1,29 @@
 """
 Tagging Org API Views
 """
-
-from openedx_tagging.core.tagging.rest_api.v1.views import TaxonomyView
-
+from openedx_tagging.core.tagging import rules as oel_tagging_rules
+from openedx_tagging.core.tagging.rest_api.v1.views import ObjectTagView, TaxonomyView
+from rest_framework import status
+from rest_framework.decorators import action
+from rest_framework.exceptions import PermissionDenied
+from rest_framework.request import Request
+from rest_framework.response import Response
 
 from ...api import (
     create_taxonomy,
+    get_taxonomy,
     get_taxonomies,
     get_taxonomies_for_org,
+    set_taxonomy_orgs,
 )
-from .serializers import TaxonomyOrgListQueryParamsSerializer
-from .filters import UserOrgFilterBackend
+from ...rules import get_admin_orgs
+from .serializers import TaxonomyOrgListQueryParamsSerializer, TaxonomyOrgSerializer, TaxonomyUpdateOrgBodySerializer
+from .filters import ObjectTagTaxonomyOrgFilterBackend, UserOrgFilterBackend
 
 
 class TaxonomyOrgView(TaxonomyView):
     """
-    View to list, create, retrieve, update, or delete Taxonomies.
+    View to list, create, retrieve, update, delete, export or import Taxonomies.
     This view extends the TaxonomyView to add Organization filters.
 
     Refer to TaxonomyView docstring for usage details.
@@ -35,6 +42,7 @@ class TaxonomyOrgView(TaxonomyView):
     """
 
     filter_backends = [UserOrgFilterBackend]
+    serializer_class = TaxonomyOrgSerializer
 
     def get_queryset(self):
         """
@@ -47,14 +55,75 @@ def get_queryset(self):
         query_params = TaxonomyOrgListQueryParamsSerializer(data=self.request.query_params.dict())
         query_params.is_valid(raise_exception=True)
         enabled = query_params.validated_data.get("enabled", None)
+
+        # If org filtering was requested, then use it, even if the org is invalid/None
         org = query_params.validated_data.get("org", None)
-        if org:
-            return get_taxonomies_for_org(enabled, org)
+        if "org" in query_params.validated_data:
+            queryset = get_taxonomies_for_org(enabled, org)
         else:
-            return get_taxonomies(enabled)
+            queryset = get_taxonomies(enabled)
+
+        return queryset.prefetch_related("taxonomyorg_set")
 
     def perform_create(self, serializer):
         """
         Create a new taxonomy.
         """
-        serializer.instance = create_taxonomy(**serializer.validated_data)
+        user_admin_orgs = get_admin_orgs(self.request.user)
+        serializer.instance = create_taxonomy(**serializer.validated_data, orgs=user_admin_orgs)
+
+    @action(detail=False, url_path="import", methods=["post"])
+    def create_import(self, request: Request, **kwargs) -> Response:
+        """
+        Creates a new taxonomy with the given orgs and imports the tags from the uploaded file.
+        """
+        response = super().create_import(request, **kwargs)
+
+        # If creation was successful, set the orgs for the new taxonomy
+        if status.is_success(response.status_code):
+            # ToDo: This code is temporary
+            # In the future, the orgs parameter will be defined in the request body from the frontend
+            # See: https://github.com/openedx/modular-learning/issues/116
+            if oel_tagging_rules.is_taxonomy_admin(request.user):
+                orgs = None
+            else:
+                orgs = get_admin_orgs(request.user)
+
+            taxonomy = get_taxonomy(response.data["id"])
+            assert taxonomy
+            set_taxonomy_orgs(taxonomy, all_orgs=False, orgs=orgs)
+
+            serializer = self.get_serializer(taxonomy)
+            return Response(serializer.data, status=status.HTTP_201_CREATED)
+
+        return response
+
+    @action(detail=True, methods=["put"])
+    def orgs(self, request, **_kwargs) -> Response:
+        """
+        Update the orgs associated with taxonomies.
+        """
+        taxonomy = self.get_object()
+        perm = "oel_tagging.update_orgs"
+        if not request.user.has_perm(perm, taxonomy):
+            raise PermissionDenied("You do not have permission to update the orgs associated with this taxonomy.")
+        body = TaxonomyUpdateOrgBodySerializer(
+            data=request.data,
+        )
+        body.is_valid(raise_exception=True)
+        orgs = body.validated_data.get("orgs")
+        all_orgs: bool = body.validated_data.get("all_orgs", False)
+
+        set_taxonomy_orgs(taxonomy=taxonomy, all_orgs=all_orgs, orgs=orgs)
+
+        return Response()
+
+
+class ObjectTagOrgView(ObjectTagView):
+    """
+    View to create and retrieve ObjectTags for a provided Object ID (object_id).
+    This view extends the ObjectTagView to add Organization filters for the results.
+
+    Refer to ObjectTagView docstring for usage details.
+    """
+    filter_backends = [ObjectTagTaxonomyOrgFilterBackend]
diff --git a/openedx/core/djangoapps/content_tagging/rules.py b/openedx/core/djangoapps/content_tagging/rules.py
index bad38019ce51..348ab52c6aeb 100644
--- a/openedx/core/djangoapps/content_tagging/rules.py
+++ b/openedx/core/djangoapps/content_tagging/rules.py
@@ -6,35 +6,210 @@
 
 import django.contrib.auth.models
 import openedx_tagging.core.tagging.rules as oel_tagging
+from organizations.models import Organization
 import rules
 from opaque_keys import InvalidKeyError
 from opaque_keys.edx.keys import CourseKey, UsageKey
 
-from common.djangoapps.student.auth import is_content_creator, has_studio_write_access
+from common.djangoapps.student.auth import has_studio_read_access, has_studio_write_access
+from common.djangoapps.student.models import CourseAccessRole
+from common.djangoapps.student.roles import (
+    CourseInstructorRole,
+    CourseStaffRole,
+    OrgContentCreatorRole,
+    OrgInstructorRole,
+    OrgLibraryUserRole,
+    OrgStaffRole
+)
+from openedx.core.djangoapps.content_libraries.api import get_libraries_for_user
 
 from .models import TaxonomyOrg
 
 UserType = Union[django.contrib.auth.models.User, django.contrib.auth.models.AnonymousUser]
 
 
-def is_taxonomy_user(user: UserType, taxonomy: oel_tagging.Taxonomy) -> bool:
+def is_org_admin(user: UserType, orgs: list[Organization] | None = None) -> bool:
     """
-    Returns True if the given user is a Taxonomy User for the given content taxonomy.
+    Return True if the given user is an admin for any of the given orgs.
+    """
+
+    return len(get_admin_orgs(user, orgs)) > 0
+
+
+def is_org_user(user: UserType, orgs: list[Organization]) -> bool:
+    """
+    Return True if the given user is a member of any of the given orgs.
+    """
+    return len(get_user_orgs(user, orgs)) > 0
+
+
+def get_admin_orgs(user: UserType, orgs: list[Organization] | None = None) -> list[Organization]:
+    """
+    Returns a list of orgs that the given user is an admin, from the given list of orgs.
+
+    If no orgs are provided, check all orgs
+    """
+    org_list = Organization.objects.all() if orgs is None else orgs
+    return [
+        org for org in org_list if OrgStaffRole(org=org.short_name).has_user(user)
+    ]
+
+
+def get_content_creator_orgs(user: UserType, orgs: list[Organization]) -> list[Organization]:
+    """
+    Returns a list of orgs that the given user is a content creator, the given list of orgs.
+    """
+    return [
+        org for org in orgs if (
+            OrgLibraryUserRole(org=org.short_name).has_user(user) or
+            OrgInstructorRole(org=org.short_name).has_user(user) or
+            OrgContentCreatorRole(org=org.short_name).has_user(user)
+        )
+    ]
+
+
+def get_instructor_orgs(user: UserType, orgs: list[Organization]) -> list[Organization]:
+    """
+    Returns a list of orgs that the given user is an instructor, from the given list of orgs.
+    """
+    instructor_roles = CourseAccessRole.objects.filter(
+        org__in=(org.short_name for org in orgs),
+        user=user,
+        role__in=(CourseStaffRole.ROLE, CourseInstructorRole.ROLE),
+    )
+    instructor_orgs = [role.org for role in instructor_roles]
+    return [org for org in orgs if org.short_name in instructor_orgs]
+
+
+def get_library_user_orgs(user: UserType, orgs: list[Organization]) -> list[Organization]:
+    """
+    Returns a list of orgs that the given user has explicity permission, from the given list of orgs.
+    """
+    return [
+        org for org in orgs if (
+            len(get_libraries_for_user(user, org=org.short_name)) > 0
+        )
+    ]
+
+
+def get_user_orgs(user: UserType, orgs: list[Organization]) -> list[Organization]:
+    """
+    Return a list of orgs that the given user is a member of (instructor or content creator),
+    from the given list of orgs.
+    """
+    content_creator_orgs = get_content_creator_orgs(user, orgs)
+    instructor_orgs = get_instructor_orgs(user, orgs)
+    library_user_orgs = get_library_user_orgs(user, orgs)
+    user_orgs = list(set(content_creator_orgs) | set(instructor_orgs) | set(library_user_orgs))
+
+    return user_orgs
+
+
+def can_create_taxonomy(user: UserType) -> bool:
+    """
+    Returns True if the given user can create a taxonomy.
+
+    Taxonomy admins and org-level staff can create taxonomies.
+    """
+    # Taxonomy admins can view any taxonomy
+    if oel_tagging.is_taxonomy_admin(user):
+        return True
+
+    # Org-level staff can create taxonomies associated with one of their orgs.
+    if is_org_admin(user):
+        return True
+
+    return False
+
+
+@rules.predicate
+def can_view_taxonomy(user: UserType, taxonomy: oel_tagging.Taxonomy) -> bool:
+    """
+    Returns True if the given user can view the given taxonomy.
+
+    Taxonomy admins can view any taxonomy.
+    Org-level staff can view any taxonomy that is associated with one of their orgs.
+    Org-level course creators and instructors can view any enabled taxonomy that is owned by one of their orgs.
+    """
+    # The following code allows METHOD permission (GET) in the viewset for everyone
+    if not taxonomy:
+        return True
+
+    taxonomy = taxonomy.cast()
 
-    Taxonomy users include global staff and superusers, plus course creators who can create courses for any org.
-    Otherwise, we need to check taxonomy provided to determine if the user is an org-level course creator for one of
-    the orgs allowed to use this taxonomy. Only global staff and superusers can use disabled system taxonomies.
+    # Taxonomy admins can view any taxonomy
+    if oel_tagging.is_taxonomy_admin(user):
+        return True
+
+    is_all_org = TaxonomyOrg.objects.filter(
+        taxonomy=taxonomy,
+        org=None,
+        rel_type=TaxonomyOrg.RelType.OWNER,
+    ).exists()
+
+    # Enabled all-org taxonomies can be viewed by any registred user
+    if is_all_org:
+        return taxonomy.enabled
+
+    taxonomy_orgs = TaxonomyOrg.get_organizations(
+        taxonomy=taxonomy,
+        rel_type=TaxonomyOrg.RelType.OWNER,
+    )
+
+    # Org-level staff can view any taxonomy that is associated with one of their orgs.
+    if is_org_admin(user, taxonomy_orgs):
+        return True
+
+    # Org-level course creators and instructors can view any enabled taxonomy that is owned by one of their orgs.
+    if is_org_user(user, taxonomy_orgs):
+        return taxonomy.enabled
+
+    return False
+
+
+@rules.predicate
+def can_change_taxonomy(user: UserType, taxonomy: oel_tagging.Taxonomy) -> bool:
+    """
+    Returns True if the given user can edit the given taxonomy.
+
+    System definied taxonomies cannot be edited
+    Taxonomy admins can edit any non system defined taxonomies
+    Only taxonomy admins can edit all org taxonomies
+    Org-level staff can edit any taxonomy that is associated with one of their orgs.
     """
+    # The following code allows METHOD permission (PUT, PATCH) in the viewset for everyone
+    if not taxonomy:
+        return True
+
+    taxonomy = taxonomy.cast()
+
+    # System definied taxonomies cannot be edited
+    if taxonomy.system_defined:
+        return False
+
+    # Taxonomy admins can edit any non system defined taxonomies
     if oel_tagging.is_taxonomy_admin(user):
         return True
 
+    is_all_org = TaxonomyOrg.objects.filter(
+        taxonomy=taxonomy,
+        org=None,
+        rel_type=TaxonomyOrg.RelType.OWNER,
+    ).exists()
+
+    # Only taxonomy admins can edit all org taxonomies
+    if is_all_org:
+        return False
+
     taxonomy_orgs = TaxonomyOrg.get_organizations(
         taxonomy=taxonomy,
         rel_type=TaxonomyOrg.RelType.OWNER,
     )
-    for org in taxonomy_orgs:
-        if is_content_creator(user, org.short_name):
-            return True
+
+    # Org-level staff can edit any taxonomy that is associated with one of their orgs.
+    if is_org_admin(user, taxonomy_orgs):
+        return True
+
     return False
 
 
@@ -57,12 +232,32 @@ def can_change_object_tag_objectid(user: UserType, object_id: str) -> bool:
 
 
 @rules.predicate
-def can_change_object_tag_taxonomy(user: UserType, taxonomy: oel_tagging.Taxonomy) -> bool:
+def can_view_object_tag_taxonomy(user: UserType, taxonomy: oel_tagging.Taxonomy) -> bool:
+    """
+    Only enabled taxonomy and users with permission to view this taxonomy can view object tags
+    from that taxonomy.
+
+    This rule is different from can_view_taxonomy because it checks if the taxonomy is enabled.
+    """
+    return taxonomy.cast().enabled and can_view_taxonomy(user, taxonomy)
+
+
+@rules.predicate
+def can_view_object_tag_objectid(user: UserType, object_id: str) -> bool:
     """
-    Taxonomy users can tag objects using tags from any taxonomy that they have permission to view. Only taxonomy admins
-    can tag objects using tags from disabled taxonomies.
+    Everyone that has permission to view the object should be able to tag it.
     """
-    return oel_tagging.is_taxonomy_admin(user) or (taxonomy.cast().enabled and is_taxonomy_user(user, taxonomy))
+    if not object_id:
+        raise ValueError("object_id must be provided")
+    try:
+        usage_key = UsageKey.from_string(object_id)
+        if not usage_key.course_key.is_course:
+            raise ValueError("object_id must be from a block or a course")
+        course_key = usage_key.course_key
+    except InvalidKeyError:
+        course_key = CourseKey.from_string(object_id)
+
+    return has_studio_read_access(user, course_key)
 
 
 @rules.predicate
@@ -82,10 +277,11 @@ def can_change_taxonomy_tag(user: UserType, tag: oel_tagging.Tag | None = None)
 
 
 # Taxonomy
-rules.set_perm("oel_tagging.add_taxonomy", oel_tagging.is_taxonomy_admin)
-rules.set_perm("oel_tagging.change_taxonomy", oel_tagging.can_change_taxonomy)
-rules.set_perm("oel_tagging.delete_taxonomy", oel_tagging.can_change_taxonomy)
-rules.set_perm("oel_tagging.view_taxonomy", oel_tagging.can_view_taxonomy)
+rules.set_perm("oel_tagging.add_taxonomy", can_create_taxonomy)
+rules.set_perm("oel_tagging.change_taxonomy", can_change_taxonomy)
+rules.set_perm("oel_tagging.delete_taxonomy", can_change_taxonomy)
+rules.set_perm("oel_tagging.view_taxonomy", can_view_taxonomy)
+rules.add_perm("oel_tagging.update_orgs", oel_tagging.is_taxonomy_admin)
 
 # Tag
 rules.set_perm("oel_tagging.add_tag", can_change_taxonomy_tag)
@@ -95,11 +291,13 @@ def can_change_taxonomy_tag(user: UserType, tag: oel_tagging.Tag | None = None)
 
 # ObjectTag
 rules.set_perm("oel_tagging.add_object_tag", oel_tagging.can_change_object_tag)
-rules.set_perm("oel_tagging.change_object_tag", oel_tagging.can_change_object_tag)
-rules.set_perm("oel_tagging.delete_object_tag", oel_tagging.can_change_object_tag)
-rules.set_perm("oel_tagging.view_object_tag", rules.always_allow)
+rules.set_perm("oel_tagging.change_objecttag", oel_tagging.can_change_object_tag)
+rules.set_perm("oel_tagging.delete_objecttag", oel_tagging.can_change_object_tag)
+rules.set_perm("oel_tagging.view_objecttag", oel_tagging.can_view_object_tag)
 
 # This perms are used in the tagging rest api from openedx_tagging that is exposed in the CMS. They are overridden here
 # to include Organization and objects permissions.
-rules.set_perm("oel_tagging.change_objecttag_taxonomy", can_change_object_tag_taxonomy)
+rules.set_perm("oel_tagging.view_objecttag_taxonomy", can_view_object_tag_taxonomy)
+rules.set_perm("oel_tagging.view_objecttag_objectid", can_view_object_tag_objectid)
+rules.set_perm("oel_tagging.change_objecttag_taxonomy", can_view_object_tag_taxonomy)
 rules.set_perm("oel_tagging.change_objecttag_objectid", can_change_object_tag_objectid)
diff --git a/openedx/core/djangoapps/content_tagging/tasks.py b/openedx/core/djangoapps/content_tagging/tasks.py
index f28b6d156dcc..063a24072e1f 100644
--- a/openedx/core/djangoapps/content_tagging/tasks.py
+++ b/openedx/core/djangoapps/content_tagging/tasks.py
@@ -35,7 +35,7 @@ def _set_initial_language_tag(content_key: ContentKey, lang_code: str) -> None:
     """
     lang_taxonomy = Taxonomy.objects.get(pk=LANGUAGE_TAXONOMY_ID).cast()
 
-    if lang_code and not api.get_content_tags(object_key=content_key, taxonomy_id=lang_taxonomy.id).exists():
+    if lang_code and not api.get_content_tags(object_key=content_key, taxonomy_id=lang_taxonomy.id):
         try:
             lang_tag = lang_taxonomy.tag_for_external_id(lang_code)
         except api.oel_tagging.TagDoesNotExist:
diff --git a/openedx/core/djangoapps/content_tagging/tests/test_api.py b/openedx/core/djangoapps/content_tagging/tests/test_api.py
index c0595dffb679..c086396ee2a0 100644
--- a/openedx/core/djangoapps/content_tagging/tests/test_api.py
+++ b/openedx/core/djangoapps/content_tagging/tests/test_api.py
@@ -22,7 +22,7 @@ def setUp(self):
             name="Learning Objectives",
             enabled=False,
         )
-        api.set_taxonomy_orgs(self.taxonomy_disabled, all_orgs=True)
+        api.set_taxonomy_orgs(self.taxonomy_disabled, orgs=[self.org1, self.org2])
         self.taxonomy_all_orgs = api.create_taxonomy(
             name="Content Types",
             enabled=True,
@@ -121,8 +121,8 @@ def test_get_taxonomies_enabled_subclasses(self):
     @ddt.data(
         # All orgs
         (None, True, ["taxonomy_all_orgs"]),
-        (None, False, ["taxonomy_disabled"]),
-        (None, None, ["taxonomy_all_orgs", "taxonomy_disabled"]),
+        (None, False, []),
+        (None, None, ["taxonomy_all_orgs"]),
         # Org 1
         ("org1", True, ["taxonomy_all_orgs", "taxonomy_one_org", "taxonomy_both_orgs"]),
         ("org1", False, ["taxonomy_disabled"]),
@@ -210,7 +210,12 @@ def test_get_content_tags(
         assert valid_tags[0].id == object_tag.id
 
     def test_get_tags(self):
-        assert api.get_tags(self.taxonomy_all_orgs) == [self.tag_all_orgs]
+        result = list(api.get_tags(self.taxonomy_all_orgs))
+        assert len(result) == 1
+        assert result[0]["value"] == self.tag_all_orgs.value
+        assert result[0]["_id"] == self.tag_all_orgs.id
+        assert result[0]["parent_value"] is None
+        assert result[0]["depth"] == 0
 
     def test_cannot_tag_across_orgs(self):
         """
diff --git a/openedx/core/djangoapps/content_tagging/tests/test_rules.py b/openedx/core/djangoapps/content_tagging/tests/test_rules.py
index 013b82255840..9c1187ab9137 100644
--- a/openedx/core/djangoapps/content_tagging/tests/test_rules.py
+++ b/openedx/core/djangoapps/content_tagging/tests/test_rules.py
@@ -2,17 +2,16 @@
 
 import ddt
 from django.contrib.auth import get_user_model
-from django.test.testcases import TestCase, override_settings
+from django.test import TestCase
 from opaque_keys.edx.locator import BlockUsageLocator, CourseLocator
 from openedx_tagging.core.tagging.models import (
     Tag,
     UserSystemDefinedTaxonomy,
 )
-from openedx_tagging.core.tagging.rules import ChangeObjectTagPermissionItem
-from organizations.models import Organization
+from openedx_tagging.core.tagging.rules import ObjectTagPermissionItem
 
 from common.djangoapps.student.auth import add_users, update_org_role
-from common.djangoapps.student.roles import CourseCreatorRole, CourseStaffRole, OrgContentCreatorRole
+from common.djangoapps.student.roles import CourseStaffRole, OrgStaffRole
 
 from .. import api
 from .test_api import TestTaxonomyMixin
@@ -21,7 +20,6 @@
 
 
 @ddt.ddt
-@override_settings(FEATURES={"ENABLE_CREATOR_GROUP": True})
 class TestRulesTaxonomy(TestTaxonomyMixin, TestCase):
     """
     Tests that the expected rules have been applied to the Taxonomy models.
@@ -41,12 +39,6 @@ def setUp(self):
             email="staff@example.com",
             is_staff=True,
         )
-        # Normal user: grant course creator role (for all orgs)
-        self.user_all_orgs = User.objects.create(
-            username="user_all_orgs",
-            email="staff+all@example.com",
-        )
-        add_users(self.staff, CourseCreatorRole(), self.user_all_orgs)
 
         # Normal user: grant course creator access to both org1 and org2
         self.user_both_orgs = User.objects.create(
@@ -55,7 +47,7 @@ def setUp(self):
         )
         update_org_role(
             self.staff,
-            OrgContentCreatorRole,
+            OrgStaffRole,
             self.user_both_orgs,
             [self.org1.short_name, self.org2.short_name],
         )
@@ -66,7 +58,7 @@ def setUp(self):
             email="staff+org2@example.com",
         )
         update_org_role(
-            self.staff, OrgContentCreatorRole, self.user_org2, [self.org2.short_name]
+            self.staff, OrgStaffRole, self.user_org2, [self.org2.short_name]
         )
 
         # Normal user: no course creator access
@@ -95,67 +87,65 @@ def setUp(self):
             block_id='block_id'
         )
 
-        add_users(self.staff, CourseStaffRole(self.course1), self.user_all_orgs)
         add_users(self.staff, CourseStaffRole(self.course1), self.user_both_orgs)
-        add_users(self.staff, CourseStaffRole(self.course2), self.user_all_orgs)
         add_users(self.staff, CourseStaffRole(self.course2), self.user_both_orgs)
         add_users(self.staff, CourseStaffRole(self.course2), self.user_org2)
         add_users(self.staff, CourseStaffRole(self.course2), self.user_org2)
 
-        self.tax_all_course1 = ChangeObjectTagPermissionItem(
+        self.tax_all_course1 = ObjectTagPermissionItem(
             taxonomy=self.taxonomy_all_orgs,
             object_id=str(self.course1),
         )
-        self.tax_all_course2 = ChangeObjectTagPermissionItem(
+        self.tax_all_course2 = ObjectTagPermissionItem(
             taxonomy=self.taxonomy_all_orgs,
             object_id=str(self.course2),
         )
-        self.tax_all_xblock1 = ChangeObjectTagPermissionItem(
+        self.tax_all_xblock1 = ObjectTagPermissionItem(
             taxonomy=self.taxonomy_all_orgs,
             object_id=str(self.xblock1),
         )
-        self.tax_all_xblock2 = ChangeObjectTagPermissionItem(
+        self.tax_all_xblock2 = ObjectTagPermissionItem(
             taxonomy=self.taxonomy_all_orgs,
             object_id=str(self.xblock2),
         )
 
-        self.tax_both_course1 = ChangeObjectTagPermissionItem(
+        self.tax_both_course1 = ObjectTagPermissionItem(
             taxonomy=self.taxonomy_both_orgs,
             object_id=str(self.course1),
         )
-        self.tax_both_course2 = ChangeObjectTagPermissionItem(
+        self.tax_both_course2 = ObjectTagPermissionItem(
             taxonomy=self.taxonomy_both_orgs,
             object_id=str(self.course2),
         )
-        self.tax_both_xblock1 = ChangeObjectTagPermissionItem(
+        self.tax_both_xblock1 = ObjectTagPermissionItem(
             taxonomy=self.taxonomy_both_orgs,
             object_id=str(self.xblock1),
         )
-        self.tax_both_xblock2 = ChangeObjectTagPermissionItem(
+        self.tax_both_xblock2 = ObjectTagPermissionItem(
             taxonomy=self.taxonomy_both_orgs,
             object_id=str(self.xblock2),
         )
 
-        self.tax1_course1 = ChangeObjectTagPermissionItem(
+        self.tax1_course1 = ObjectTagPermissionItem(
             taxonomy=self.taxonomy_one_org,
             object_id=str(self.course1),
         )
-        self.tax1_xblock1 = ChangeObjectTagPermissionItem(
+        self.tax1_xblock1 = ObjectTagPermissionItem(
             taxonomy=self.taxonomy_one_org,
             object_id=str(self.xblock1),
         )
 
-        self.tax_no_org_course1 = ChangeObjectTagPermissionItem(
+        self.tax_no_org_course1 = ObjectTagPermissionItem(
             taxonomy=self.taxonomy_no_orgs,
             object_id=str(self.course1),
         )
 
-        self.tax_no_org_xblock1 = ChangeObjectTagPermissionItem(
+        self.tax_no_org_xblock1 = ObjectTagPermissionItem(
             taxonomy=self.taxonomy_no_orgs,
             object_id=str(self.xblock1),
         )
 
-        self.disabled_course_tag_perm = ChangeObjectTagPermissionItem(
+        self.disabled_course2_tag_perm = ObjectTagPermissionItem(
             taxonomy=self.taxonomy_disabled,
             object_id=str(self.course2),
         )
@@ -184,8 +174,6 @@ def _expected_users_have_perm(
         assert self.superuser.has_perm(perm, obj)
         assert self.staff.has_perm(perm)
         assert self.staff.has_perm(perm, obj)
-        assert self.user_all_orgs.has_perm(perm)
-        assert self.user_all_orgs.has_perm(perm, obj)
 
         # Org content creators are bound by a taxonomy's org restrictions
         assert self.user_both_orgs.has_perm(perm) == learner_perm
@@ -199,58 +187,78 @@ def _expected_users_have_perm(
         assert self.learner.has_perm(perm, obj) == learner_obj
 
     # Taxonomy
+    def test_taxonomy_base_add_permissions(self):
+        """
+        Test that staff, superuser and org admins can call POST on taxonomies.
+        """
+        perm = "oel_tagging.add_taxonomy"
+        assert self.superuser.has_perm(perm)
+        assert self.staff.has_perm(perm)
+        assert self.user_both_orgs.has_perm(perm)
+        assert self.user_org2.has_perm(perm)
+        assert not self.learner.has_perm(perm)
 
     @ddt.data(
-        "oel_tagging.add_taxonomy",
         "oel_tagging.change_taxonomy",
         "oel_tagging.delete_taxonomy",
     )
     def test_taxonomy_base_edit_permissions(self, perm):
         """
-        Test that only Staff & Superuser can call add/edit/delete taxonomies.
+        Test that everyone can call PUT, PATCH and DELETE on taxonomies.
         """
         assert self.superuser.has_perm(perm)
         assert self.staff.has_perm(perm)
-        assert not self.user_all_orgs.has_perm(perm)
-        assert not self.user_both_orgs.has_perm(perm)
-        assert not self.user_org2.has_perm(perm)
-        assert not self.learner.has_perm(perm)
+        assert self.user_both_orgs.has_perm(perm)
+        assert self.user_org2.has_perm(perm)
+        assert self.learner.has_perm(perm)
 
     @ddt.data(
         "oel_tagging.view_taxonomy",
     )
     def test_taxonomy_base_view_permissions(self, perm):
         """
-        Test that everyone can call view taxonomy.
+        Test that everyone can call GET on taxonomies.
         """
         assert self.superuser.has_perm(perm)
         assert self.staff.has_perm(perm)
-        assert self.user_all_orgs.has_perm(perm)
         assert self.user_both_orgs.has_perm(perm)
         assert self.user_org2.has_perm(perm)
         assert self.learner.has_perm(perm)
 
     @ddt.data(
-        ("oel_tagging.change_taxonomy", "taxonomy_all_orgs"),
         ("oel_tagging.change_taxonomy", "taxonomy_disabled"),
         ("oel_tagging.change_taxonomy", "taxonomy_both_orgs"),
         ("oel_tagging.change_taxonomy", "taxonomy_one_org"),
-        ("oel_tagging.change_taxonomy", "taxonomy_no_orgs"),
-        ("oel_tagging.delete_taxonomy", "taxonomy_all_orgs"),
         ("oel_tagging.delete_taxonomy", "taxonomy_disabled"),
         ("oel_tagging.delete_taxonomy", "taxonomy_both_orgs"),
         ("oel_tagging.delete_taxonomy", "taxonomy_one_org"),
-        ("oel_tagging.delete_taxonomy", "taxonomy_no_orgs"),
     )
     @ddt.unpack
     def test_change_taxonomy(self, perm, taxonomy_attr):
         """
-        Test that only Staff & Superuser can edit/delete taxonomies.
+        Test that only instance level and org level admins can edit/delete taxonomies from their orgs.
+        """
+        taxonomy = getattr(self, taxonomy_attr)
+        assert self.superuser.has_perm(perm, taxonomy)
+        assert self.staff.has_perm(perm, taxonomy)
+        assert self.user_both_orgs.has_perm(perm, taxonomy)
+        assert self.user_org2.has_perm(perm, taxonomy) == (taxonomy_attr != "taxonomy_one_org")
+        assert not self.learner.has_perm(perm, taxonomy)
+
+    @ddt.data(
+        ("oel_tagging.change_taxonomy", "taxonomy_all_orgs"),
+        ("oel_tagging.change_taxonomy", "taxonomy_no_orgs"),
+        ("oel_tagging.delete_taxonomy", "taxonomy_all_orgs"),
+        ("oel_tagging.delete_taxonomy", "taxonomy_no_orgs"),
+    )
+    @ddt.unpack
+    def test_change_taxonomy_all_no_org(self, perm, taxonomy_attr):
+        """
+        Test that only Staff & Superuser can edit/delete taxonomies from all or no org.
         """
         taxonomy = getattr(self, taxonomy_attr)
         assert self.superuser.has_perm(perm, taxonomy)
         assert self.staff.has_perm(perm, taxonomy)
-        assert not self.user_all_orgs.has_perm(perm, taxonomy)
         assert not self.user_both_orgs.has_perm(perm, taxonomy)
         assert not self.user_org2.has_perm(perm, taxonomy)
         assert not self.learner.has_perm(perm, taxonomy)
@@ -270,20 +278,31 @@ def test_system_taxonomy(self, perm):
         system_taxonomy = system_taxonomy.cast()
         assert self.superuser.has_perm(perm, system_taxonomy)
         assert not self.staff.has_perm(perm, system_taxonomy)
-        assert not self.user_all_orgs.has_perm(perm, system_taxonomy)
         assert not self.user_both_orgs.has_perm(perm, system_taxonomy)
         assert not self.user_org2.has_perm(perm, system_taxonomy)
         assert not self.learner.has_perm(perm, system_taxonomy)
 
+    def test_view_taxonomy_no_orgs(self):
+        """
+        Test that only Staff & Superuser can view taxonomies with no orgs.
+        """
+        taxonomy = self.taxonomy_no_orgs
+        taxonomy.enabled = True
+        perm = "oel_tagging.view_taxonomy"
+
+        assert self.superuser.has_perm(perm, taxonomy)
+        assert self.staff.has_perm(perm, taxonomy)
+        assert not self.user_both_orgs.has_perm(perm, taxonomy)
+        assert not self.user_org2.has_perm(perm, taxonomy)
+        assert not self.learner.has_perm(perm, taxonomy)
+
     @ddt.data(
-        "taxonomy_all_orgs",
         "taxonomy_both_orgs",
         "taxonomy_one_org",
-        "taxonomy_no_orgs",
     )
     def test_view_taxonomy_enabled(self, taxonomy_attr):
         """
-        Test that anyone can view enabled taxonomies.
+        Test that anyone can view enabled taxonomies from their org.
         """
         taxonomy = getattr(self, taxonomy_attr)
         taxonomy.enabled = True
@@ -291,20 +310,31 @@ def test_view_taxonomy_enabled(self, taxonomy_attr):
 
         assert self.superuser.has_perm(perm, taxonomy)
         assert self.staff.has_perm(perm, taxonomy)
-        assert self.user_all_orgs.has_perm(perm, taxonomy)
+        assert self.user_both_orgs.has_perm(perm, taxonomy)
+        assert self.user_org2.has_perm(perm, taxonomy) == (taxonomy_attr != "taxonomy_one_org")
+        assert not self.learner.has_perm(perm, taxonomy)
+
+    def test_view_taxonomy_enabled_all_orgs(self):
+        """
+        Test that anyone can view enabled global taxonomies.
+        """
+        taxonomy = self.taxonomy_all_orgs
+        taxonomy.enabled = True
+        perm = "oel_tagging.view_taxonomy"
+
+        assert self.superuser.has_perm(perm, taxonomy)
+        assert self.staff.has_perm(perm, taxonomy)
         assert self.user_both_orgs.has_perm(perm, taxonomy)
         assert self.user_org2.has_perm(perm, taxonomy)
         assert self.learner.has_perm(perm, taxonomy)
 
     @ddt.data(
-        "taxonomy_all_orgs",
         "taxonomy_both_orgs",
         "taxonomy_one_org",
-        "taxonomy_no_orgs",
     )
     def test_view_taxonomy_disabled(self, taxonomy_attr):
         """
-        Test that only Staff & Superuser can view disabled taxonomies.
+        Test that only instance level and org level admins can view disabled taxonomies.
         """
         taxonomy = getattr(self, taxonomy_attr)
         taxonomy.enabled = False
@@ -312,7 +342,34 @@ def test_view_taxonomy_disabled(self, taxonomy_attr):
 
         assert self.superuser.has_perm(perm, taxonomy)
         assert self.staff.has_perm(perm, taxonomy)
-        assert not self.user_all_orgs.has_perm(perm, taxonomy)
+        assert self.user_both_orgs.has_perm(perm, taxonomy)
+        assert self.user_org2.has_perm(perm, taxonomy) == (taxonomy_attr != "taxonomy_one_org")
+        assert not self.learner.has_perm(perm, taxonomy)
+
+    def test_view_taxonomy_all_orgs_disabled(self):
+        """
+        Test that only instance level admins can view disabled all org taxonomies.
+        """
+        taxonomy = self.taxonomy_all_orgs
+        taxonomy.enabled = False
+        perm = "oel_tagging.view_taxonomy"
+
+        assert self.superuser.has_perm(perm, taxonomy)
+        assert self.staff.has_perm(perm, taxonomy)
+        assert not self.user_both_orgs.has_perm(perm, taxonomy)
+        assert not self.user_org2.has_perm(perm, taxonomy)
+        assert not self.learner.has_perm(perm, taxonomy)
+
+    def test_view_taxonomy_disabled_no_org(self):
+        """
+        Test that only Staff & Superuser can view disabled taxonomies with no orgs.
+        """
+        taxonomy = self.taxonomy_no_orgs
+        taxonomy.enabled = False
+        perm = "oel_tagging.view_taxonomy"
+
+        assert self.superuser.has_perm(perm, taxonomy)
+        assert self.staff.has_perm(perm, taxonomy)
         assert not self.user_both_orgs.has_perm(perm, taxonomy)
         assert not self.user_org2.has_perm(perm, taxonomy)
         assert not self.learner.has_perm(perm, taxonomy)
@@ -330,21 +387,17 @@ def test_tag_base_edit_permissions(self, perm):
         """
         assert self.superuser.has_perm(perm)
         assert self.staff.has_perm(perm)
-        assert not self.user_all_orgs.has_perm(perm)
         assert not self.user_both_orgs.has_perm(perm)
         assert not self.user_org2.has_perm(perm)
         assert not self.learner.has_perm(perm)
 
-    @ddt.data(
-        "oel_tagging.view_tag",
-    )
-    def test_tag_base_view_permissions(self, perm):
+    def test_tag_base_view_permissions(self):
         """
         Test that everyone can call view tag.
         """
+        perm = "oel_tagging.view_tag"
         assert self.superuser.has_perm(perm)
         assert self.staff.has_perm(perm)
-        assert self.user_all_orgs.has_perm(perm)
         assert self.user_both_orgs.has_perm(perm)
         assert self.user_org2.has_perm(perm)
         assert self.learner.has_perm(perm)
@@ -369,7 +422,6 @@ def test_change_tag(self, perm, tag_attr):
         tag = getattr(self, tag_attr)
         assert self.superuser.has_perm(perm, tag)
         assert self.staff.has_perm(perm, tag)
-        assert not self.user_all_orgs.has_perm(perm, tag)
         assert not self.user_both_orgs.has_perm(perm, tag)
         assert not self.user_org2.has_perm(perm, tag)
         assert not self.learner.has_perm(perm, tag)
@@ -394,7 +446,6 @@ def test_system_taxonomy_tag(self, perm):
 
         assert self.superuser.has_perm(perm, tag_system_taxonomy)
         assert not self.staff.has_perm(perm, tag_system_taxonomy)
-        assert not self.user_all_orgs.has_perm(perm, tag_system_taxonomy)
         assert not self.user_both_orgs.has_perm(perm, tag_system_taxonomy)
         assert not self.user_org2.has_perm(perm, tag_system_taxonomy)
         assert not self.learner.has_perm(perm, tag_system_taxonomy)
@@ -419,7 +470,6 @@ def test_free_text_taxonomy_tag(self, perm):
 
         assert self.superuser.has_perm(perm, tag_free_text_taxonomy)
         assert not self.staff.has_perm(perm, tag_free_text_taxonomy)
-        assert not self.user_all_orgs.has_perm(perm, tag_free_text_taxonomy)
         assert not self.user_both_orgs.has_perm(perm, tag_free_text_taxonomy)
         assert not self.user_org2.has_perm(perm, tag_free_text_taxonomy)
         assert not self.learner.has_perm(perm, tag_free_text_taxonomy)
@@ -437,7 +487,6 @@ def test_tag_no_taxonomy(self, perm):
         assert self.staff.has_perm(perm, tag)
 
         # Everyone else can't do anything
-        assert not self.user_all_orgs.has_perm(perm, tag)
         assert not self.user_both_orgs.has_perm(perm, tag)
         assert not self.user_org2.has_perm(perm, tag)
         assert not self.learner.has_perm(perm, tag)
@@ -459,28 +508,29 @@ def test_view_tag(self, tag_attr):
     # ObjectTag
 
     @ddt.data(
-        ("oel_tagging.add_object_tag", "disabled_course_tag_perm"),
-        ("oel_tagging.change_object_tag", "disabled_course_tag_perm"),
-        ("oel_tagging.delete_object_tag", "disabled_course_tag_perm"),
+        ("oel_tagging.add_objecttag", "disabled_course2_tag_perm"),
+        ("oel_tagging.change_objecttag", "disabled_course2_tag_perm"),
+        ("oel_tagging.delete_objecttag", "disabled_course2_tag_perm"),
     )
     @ddt.unpack
     def test_object_tag_disabled_taxonomy(self, perm, tag_attr):
-        """Only taxonomy administrators can create/edit an ObjectTag using a disabled Taxonomy"""
+        """
+        Only superuser create/edit an ObjectTag using a disabled Taxonomy
+        """
         object_tag_perm = getattr(self, tag_attr)
         assert self.superuser.has_perm(perm, object_tag_perm)
-        assert self.staff.has_perm(perm, object_tag_perm)
-        assert not self.user_all_orgs.has_perm(perm, object_tag_perm)
+        assert not self.staff.has_perm(perm, object_tag_perm)
         assert not self.user_both_orgs.has_perm(perm, object_tag_perm)
         assert not self.user_org2.has_perm(perm, object_tag_perm)
         assert not self.learner.has_perm(perm, object_tag_perm)
 
     @ddt.data(
-        ("oel_tagging.add_object_tag", "tax_no_org_course1"),
-        ("oel_tagging.add_object_tag", "tax_no_org_xblock1"),
-        ("oel_tagging.change_object_tag", "tax_no_org_course1"),
-        ("oel_tagging.change_object_tag", "tax_no_org_xblock1"),
-        ("oel_tagging.delete_object_tag", "tax_no_org_xblock1"),
-        ("oel_tagging.delete_object_tag", "tax_no_org_course1"),
+        ("oel_tagging.add_objecttag", "tax_no_org_course1"),
+        ("oel_tagging.add_objecttag", "tax_no_org_xblock1"),
+        ("oel_tagging.change_objecttag", "tax_no_org_course1"),
+        ("oel_tagging.change_objecttag", "tax_no_org_xblock1"),
+        ("oel_tagging.delete_objecttag", "tax_no_org_xblock1"),
+        ("oel_tagging.delete_objecttag", "tax_no_org_course1"),
     )
     @ddt.unpack
     def test_object_tag_no_orgs(self, perm, tag_attr):
@@ -488,15 +538,14 @@ def test_object_tag_no_orgs(self, perm, tag_attr):
         object_tag = getattr(self, tag_attr)
         assert self.superuser.has_perm(perm, object_tag)
         assert self.staff.has_perm(perm, object_tag)
-        assert not self.user_all_orgs.has_perm(perm, object_tag)
         assert not self.user_both_orgs.has_perm(perm, object_tag)
         assert not self.user_org2.has_perm(perm, object_tag)
         assert not self.learner.has_perm(perm, object_tag)
 
     @ddt.data(
-        "oel_tagging.add_object_tag",
-        "oel_tagging.change_object_tag",
-        "oel_tagging.delete_object_tag",
+        "oel_tagging.add_objecttag",
+        "oel_tagging.change_objecttag",
+        "oel_tagging.delete_objecttag",
     )
     def test_change_object_tag_all_orgs(self, perm):
         """
@@ -506,18 +555,17 @@ def test_change_object_tag_all_orgs(self, perm):
         for perm_item in self.all_org_perms:
             assert self.superuser.has_perm(perm, perm_item)
             assert self.staff.has_perm(perm, perm_item)
-            assert self.user_all_orgs.has_perm(perm, perm_item)
             assert self.user_both_orgs.has_perm(perm, perm_item)
             assert self.user_org2.has_perm(perm, perm_item) == (self.org2.short_name in perm_item.object_id)
             assert not self.learner.has_perm(perm, perm_item)
 
     @ddt.data(
-        ("oel_tagging.add_object_tag", "tax1_course1"),
-        ("oel_tagging.add_object_tag", "tax1_xblock1"),
-        ("oel_tagging.change_object_tag", "tax1_course1"),
-        ("oel_tagging.change_object_tag", "tax1_xblock1"),
-        ("oel_tagging.delete_object_tag", "tax1_course1"),
-        ("oel_tagging.delete_object_tag", "tax1_xblock1"),
+        ("oel_tagging.add_objecttag", "tax1_course1"),
+        ("oel_tagging.add_objecttag", "tax1_xblock1"),
+        ("oel_tagging.change_objecttag", "tax1_course1"),
+        ("oel_tagging.change_objecttag", "tax1_xblock1"),
+        ("oel_tagging.delete_objecttag", "tax1_course1"),
+        ("oel_tagging.delete_objecttag", "tax1_xblock1"),
     )
     @ddt.unpack
     def test_change_object_tag_org1(self, perm, tag_attr):
@@ -525,83 +573,37 @@ def test_change_object_tag_org1(self, perm, tag_attr):
         perm_item = getattr(self, tag_attr)
         assert self.superuser.has_perm(perm, perm_item)
         assert self.staff.has_perm(perm, perm_item)
-        assert self.user_all_orgs.has_perm(perm, perm_item)
         assert self.user_both_orgs.has_perm(perm, perm_item)
         assert not self.user_org2.has_perm(perm, perm_item)
         assert not self.learner.has_perm(perm, perm_item)
 
     @ddt.data(
-        "all_orgs_course_tag",
-        "all_orgs_block_tag",
-        "both_orgs_course_tag",
-        "both_orgs_block_tag",
-        "one_org_block_tag",
-        "disabled_course_tag",
+        "tax_all_course1",
+        "tax_all_course2",
+        "tax_all_xblock1",
+        "tax_all_xblock2",
+        "tax_both_course1",
+        "tax_both_course2",
+        "tax_both_xblock1",
+        "tax_both_xblock2",
     )
     def test_view_object_tag(self, tag_attr):
         """Anyone can view any ObjectTag"""
-        object_tag = getattr(self, tag_attr)
-        self._expected_users_have_perm(
-            "oel_tagging.view_object_tag",
-            object_tag,
-            learner_perm=True,
-            learner_obj=True,
-        )
-
-
-@ddt.ddt
-@override_settings(FEATURES={"ENABLE_CREATOR_GROUP": False})
-class TestRulesTaxonomyNoCreatorGroup(
-    TestRulesTaxonomy
-):  # pylint: disable=test-inherits-tests
-    """
-    Run the above tests with ENABLE_CREATOR_GROUP unset, to demonstrate that all users have course creator access for
-    all orgs, and therefore everyone is a Taxonomy Administrator.
-
-    However, if there are no Organizations in the database, then nobody has access to the Tagging models.
-    """
-
-    def _expected_users_have_perm(
-        self, perm, obj, learner_perm=False, learner_obj=False, user_org2=True
-    ):
-        """
-        When ENABLE_CREATOR_GROUP is disabled, all users have all permissions.
-        """
-        super()._expected_users_have_perm(
-            perm=perm,
-            obj=obj,
-            learner_perm=learner_perm,
-            learner_obj=learner_obj,
-            user_org2=user_org2,
-        )
-
-    # Taxonomy
+        perm = "oel_tagging.view_objecttag"
+        perm_item = getattr(self, tag_attr)
+        assert self.superuser.has_perm(perm, perm_item)
+        assert self.staff.has_perm(perm, perm_item)
+        assert self.user_both_orgs.has_perm(perm, perm_item)
+        assert self.user_org2.has_perm(perm, perm_item) == tag_attr.endswith("2")
+        assert not self.learner.has_perm(perm, perm_item)
 
-    @ddt.data(
-        ("oel_tagging.change_taxonomy", "taxonomy_all_orgs"),
-        ("oel_tagging.change_taxonomy", "taxonomy_both_orgs"),
-        ("oel_tagging.change_taxonomy", "taxonomy_disabled"),
-        ("oel_tagging.change_taxonomy", "taxonomy_one_org"),
-        ("oel_tagging.change_taxonomy", "taxonomy_no_orgs"),
-        ("oel_tagging.delete_taxonomy", "taxonomy_all_orgs"),
-        ("oel_tagging.delete_taxonomy", "taxonomy_both_orgs"),
-        ("oel_tagging.delete_taxonomy", "taxonomy_disabled"),
-        ("oel_tagging.delete_taxonomy", "taxonomy_one_org"),
-        ("oel_tagging.delete_taxonomy", "taxonomy_no_orgs"),
-    )
-    @ddt.unpack
-    def test_no_orgs_no_perms(self, perm, taxonomy_attr):
+    def test_view_object_tag_diabled(self):
         """
-        Org-level permissions are revoked when there are no orgs.
+        Noboty can view a ObjectTag from a disable taxonomy
         """
-        Organization.objects.all().delete()
-        taxonomy = getattr(self, taxonomy_attr)
-        # Superusers & Staff always have access
-        assert self.superuser.has_perm(perm, taxonomy)
-        assert self.staff.has_perm(perm, taxonomy)
-
-        # But everyone else's object-level access is removed
-        assert not self.user_all_orgs.has_perm(perm, taxonomy)
-        assert not self.user_both_orgs.has_perm(perm, taxonomy)
-        assert not self.user_org2.has_perm(perm, taxonomy)
-        assert not self.learner.has_perm(perm, taxonomy)
+        perm = "oel_tagging.view_objecttag"
+        assert self.superuser.has_perm(perm, self.disabled_course_tag)
+        assert not self.staff.has_perm(perm, self.disabled_course_tag)
+        assert not self.user_both_orgs.has_perm(perm, self.disabled_course_tag)
+        assert not self.user_org2.has_perm(perm, self.disabled_course_tag)
+        assert not self.learner.has_perm(perm, self.disabled_course_tag)
diff --git a/openedx/core/djangoapps/content_tagging/tests/test_tasks.py b/openedx/core/djangoapps/content_tagging/tests/test_tasks.py
index 39e1742b9ee4..fccac3e30774 100644
--- a/openedx/core/djangoapps/content_tagging/tests/test_tasks.py
+++ b/openedx/core/djangoapps/content_tagging/tests/test_tasks.py
@@ -51,7 +51,7 @@ def setUp(self):
 
 @skip_unless_cms  # Auto-tagging is only available in the CMS
 @override_waffle_flag(CONTENT_TAGGING_AUTO, active=True)
-class TestAutoTagging(LanguageTaxonomyTestMixin, ModuleStoreTestCase):
+class TestAutoTagging(LanguageTaxonomyTestMixin, ModuleStoreTestCase):  # type: ignore[misc]
     """
     Test if the Course and XBlock tags are automatically created
     """
@@ -64,7 +64,7 @@ def _check_tag(self, object_key: ContentKey, taxonomy_id: int, value: str | None
 
         If value is None, check if the ObjectTag does not exists
         """
-        object_tags = api.get_content_tags(object_key, taxonomy_id=taxonomy_id)
+        object_tags = list(api.get_content_tags(object_key, taxonomy_id=taxonomy_id))
         object_tag = object_tags[0] if len(object_tags) == 1 else None
         if len(object_tags) > 1:
             raise ValueError("Found too many object tags")
diff --git a/openedx/core/djangoapps/contentserver/middleware.py b/openedx/core/djangoapps/contentserver/middleware.py
index 7bdb429b815e..12c63365a475 100644
--- a/openedx/core/djangoapps/contentserver/middleware.py
+++ b/openedx/core/djangoapps/contentserver/middleware.py
@@ -100,17 +100,17 @@ def process_request(self, request):
                 safe_course_key = safe_course_key.replace(run='only')
 
             if newrelic:
-                newrelic.agent.add_custom_parameter('course_id', safe_course_key)
-                newrelic.agent.add_custom_parameter('org', loc.org)
-                newrelic.agent.add_custom_parameter('contentserver.path', loc.path)
+                newrelic.agent.add_custom_attribute('course_id', safe_course_key)
+                newrelic.agent.add_custom_attribute('org', loc.org)
+                newrelic.agent.add_custom_attribute('contentserver.path', loc.path)
 
                 # Figure out if this is a CDN using us as the origin.
                 is_from_cdn = StaticContentServer.is_cdn_request(request)
-                newrelic.agent.add_custom_parameter('contentserver.from_cdn', is_from_cdn)
+                newrelic.agent.add_custom_attribute('contentserver.from_cdn', is_from_cdn)
 
                 # Check if this content is locked or not.
                 locked = self.is_content_locked(content)
-                newrelic.agent.add_custom_parameter('contentserver.locked', locked)
+                newrelic.agent.add_custom_attribute('contentserver.locked', locked)
 
             # Check that user has access to the content.
             if not self.is_user_authorized(request, content, loc):
@@ -169,7 +169,7 @@ def process_request(self, request):
                             response.status_code = 206  # Partial Content
 
                             if newrelic:
-                                newrelic.agent.add_custom_parameter('contentserver.ranged', True)
+                                newrelic.agent.add_custom_attribute('contentserver.ranged', True)
                         else:
                             log.warning(
                                 "Cannot satisfy ranges in Range header: %s for content: %s",
@@ -183,8 +183,8 @@ def process_request(self, request):
                 response['Content-Length'] = content.length
 
             if newrelic:
-                newrelic.agent.add_custom_parameter('contentserver.content_len', content.length)
-                newrelic.agent.add_custom_parameter('contentserver.content_type', content.content_type)
+                newrelic.agent.add_custom_attribute('contentserver.content_len', content.length)
+                newrelic.agent.add_custom_attribute('contentserver.content_type', content.content_type)
 
             # "Accept-Ranges: bytes" tells the user that only "bytes" ranges are allowed
             response['Accept-Ranges'] = 'bytes'
@@ -214,13 +214,13 @@ def set_caching_headers(self, content, response):
         cache_ttl = CourseAssetCacheTtlConfig.get_cache_ttl()
         if cache_ttl > 0 and not is_locked:
             if newrelic:
-                newrelic.agent.add_custom_parameter('contentserver.cacheable', True)
+                newrelic.agent.add_custom_attribute('contentserver.cacheable', True)
 
             response['Expires'] = StaticContentServer.get_expiration_value(datetime.datetime.utcnow(), cache_ttl)
             response['Cache-Control'] = "public, max-age={ttl}, s-maxage={ttl}".format(ttl=cache_ttl)
         elif is_locked:
             if newrelic:
-                newrelic.agent.add_custom_parameter('contentserver.cacheable', False)
+                newrelic.agent.add_custom_attribute('contentserver.cacheable', False)
 
             response['Cache-Control'] = "private, no-cache, no-store"
 
diff --git a/openedx/core/djangoapps/contentserver/test/test_contentserver.py b/openedx/core/djangoapps/contentserver/test/test_contentserver.py
index 700eff642778..e9ee1f7ee5b2 100644
--- a/openedx/core/djangoapps/contentserver/test/test_contentserver.py
+++ b/openedx/core/djangoapps/contentserver/test/test_contentserver.py
@@ -156,7 +156,7 @@ def test_locked_versioned_asset(self):
         CourseEnrollment.enroll(self.non_staff_usr, self.course_key)
         assert CourseEnrollment.is_enrolled(self.non_staff_usr, self.course_key)
 
-        self.client.login(username=self.non_staff_usr, password='test')
+        self.client.login(username=self.non_staff_usr, password=self.TEST_PASSWORD)
         resp = self.client.get(self.url_locked_versioned)
         assert resp.status_code == 200
 
@@ -167,7 +167,7 @@ def test_locked_versioned_old_styleasset(self):
         CourseEnrollment.enroll(self.non_staff_usr, self.course_key)
         assert CourseEnrollment.is_enrolled(self.non_staff_usr, self.course_key)
 
-        self.client.login(username=self.non_staff_usr, password='test')
+        self.client.login(username=self.non_staff_usr, password=self.TEST_PASSWORD)
         resp = self.client.get(self.url_locked_versioned_old_style, follow=True)
         assert resp.status_code == 200
 
@@ -185,7 +185,7 @@ def test_locked_asset_not_registered(self):
         Test that locked assets behave appropriately in case user is logged in
         in but not registered for the course.
         """
-        self.client.login(username=self.non_staff_usr, password='test')
+        self.client.login(username=self.non_staff_usr, password=self.TEST_PASSWORD)
         resp = self.client.get(self.url_locked)
         assert resp.status_code == 403
 
@@ -197,7 +197,7 @@ def test_locked_asset_registered(self):
         CourseEnrollment.enroll(self.non_staff_usr, self.course_key)
         assert CourseEnrollment.is_enrolled(self.non_staff_usr, self.course_key)
 
-        self.client.login(username=self.non_staff_usr, password='test')
+        self.client.login(username=self.non_staff_usr, password=self.TEST_PASSWORD)
         resp = self.client.get(self.url_locked)
         assert resp.status_code == 200
 
@@ -205,7 +205,7 @@ def test_locked_asset_staff(self):
         """
         Test that locked assets behave appropriately in case user is staff.
         """
-        self.client.login(username=self.staff_usr, password='test')
+        self.client.login(username=self.staff_usr, password=self.TEST_PASSWORD)
         resp = self.client.get(self.url_locked)
         assert resp.status_code == 200
 
@@ -320,7 +320,7 @@ def test_cache_headers_with_ttl_locked(self, mock_get_cache_ttl):
         CourseEnrollment.enroll(self.non_staff_usr, self.course_key)
         assert CourseEnrollment.is_enrolled(self.non_staff_usr, self.course_key)
 
-        self.client.login(username=self.non_staff_usr, password='test')
+        self.client.login(username=self.non_staff_usr, password=self.TEST_PASSWORD)
         resp = self.client.get(self.url_locked)
         assert resp.status_code == 200
         assert 'Expires' not in resp
@@ -350,7 +350,7 @@ def test_cache_headers_without_ttl_locked(self, mock_get_cache_ttl):
         CourseEnrollment.enroll(self.non_staff_usr, self.course_key)
         assert CourseEnrollment.is_enrolled(self.non_staff_usr, self.course_key)
 
-        self.client.login(username=self.non_staff_usr, password='test')
+        self.client.login(username=self.non_staff_usr, password=self.TEST_PASSWORD)
         resp = self.client.get(self.url_locked)
         assert resp.status_code == 200
         assert 'Expires' not in resp
diff --git a/openedx/core/djangoapps/course_apps/rest_api/tests/test_views.py b/openedx/core/djangoapps/course_apps/rest_api/tests/test_views.py
index 2c1e615229b6..768643a7a204 100644
--- a/openedx/core/djangoapps/course_apps/rest_api/tests/test_views.py
+++ b/openedx/core/djangoapps/course_apps/rest_api/tests/test_views.py
@@ -32,7 +32,7 @@ def setUp(self):
         self.instructor = UserFactory()
         self.user = UserFactory()
         self.client = Client()
-        self.client.login(username=self.instructor.username, password="test")
+        self.client.login(username=self.instructor.username, password=self.TEST_PASSWORD)
         self.url = reverse("course_apps_api:v1:course_apps", kwargs=dict(course_id=self.course.id))
         CourseStaffRole(self.course.id).add_users(self.instructor)
 
diff --git a/openedx/core/djangoapps/course_apps/toggles.py b/openedx/core/djangoapps/course_apps/toggles.py
index d7878b02fd8f..22a1aef70e06 100644
--- a/openedx/core/djangoapps/course_apps/toggles.py
+++ b/openedx/core/djangoapps/course_apps/toggles.py
@@ -6,19 +6,6 @@
 #: Namespace for use by course apps for creating availability toggles
 COURSE_APPS_WAFFLE_NAMESPACE = 'course_apps'
 
-# .. toggle_name: course_apps.proctoring_settings_modal_view
-# .. toggle_use_cases: temporary
-# .. toggle_implementation: CourseWaffleFlag
-# .. toggle_default: False
-# .. toggle_description: When enabled, users will be directed to a new proctoring settings
-#    modal on the Pages and Resources view when accessing proctored exam settings.
-# .. toggle_warning: None
-# .. toggle_creation_date: 2021-08-17
-# .. toggle_target_removal_date: None
-PROCTORING_SETTINGS_MODAL_VIEW = CourseWaffleFlag(
-    f'{COURSE_APPS_WAFFLE_NAMESPACE}.proctoring_settings_modal_view', __name__
-)
-
 # .. toggle_name: course_apps.exams_ida
 # .. toggle_implementation: CourseWaffleFlag
 # .. toggle_default: False
@@ -32,13 +19,6 @@
 )
 
 
-def proctoring_settings_modal_view_enabled(course_key):
-    """
-    Returns a boolean if proctoring settings modal view is enabled for a course.
-    """
-    return PROCTORING_SETTINGS_MODAL_VIEW.is_enabled(course_key)
-
-
 def exams_ida_enabled(course_key):
     """
     Returns a boolean if exams ida view is enabled for a course.
diff --git a/openedx/core/djangoapps/discussions/serializers.py b/openedx/core/djangoapps/discussions/serializers.py
index eff12d92026f..46778320c91d 100644
--- a/openedx/core/djangoapps/discussions/serializers.py
+++ b/openedx/core/djangoapps/discussions/serializers.py
@@ -13,6 +13,7 @@
 from openedx.core.lib.courses import get_course_by_id
 from .models import DiscussionsConfiguration, Provider
 from .utils import available_division_schemes, get_divided_discussions
+from ..content.course_overviews.models import CourseOverviewTab
 
 
 class LtiSerializer(serializers.ModelSerializer):
@@ -259,6 +260,12 @@ def update(self, instance: DiscussionsConfiguration, validated_data: dict) -> Di
         # have already been set
         instance = self._update_lti(instance, validated_data)
         instance.save()
+        # find the discussion tab and update its visibility as per discussions configurations
+        # It can go out of sync due to unknown reasons
+        CourseOverviewTab.objects.filter(
+            course_overview_id=instance.context_key,
+            type='discussion'
+        ).update(is_hidden=not instance.enabled)
         update_discussions_settings_from_course_task.delay(str(instance.context_key))
         return instance
 
diff --git a/openedx/core/djangoapps/embargo/tests/test_views.py b/openedx/core/djangoapps/embargo/tests/test_views.py
index fae484a32d16..1c8ea7268406 100644
--- a/openedx/core/djangoapps/embargo/tests/test_views.py
+++ b/openedx/core/djangoapps/embargo/tests/test_views.py
@@ -148,7 +148,7 @@ def mock_country(reader, country):
     def test_course_access_endpoint_with_logged_out_user(self):
         self.client.logout()
         response = self.client.get(self.url, data=self.request_data)
-        assert response.status_code == 403
+        assert response.status_code == 401
 
     def test_course_access_endpoint_with_non_staff_user(self):
         user = UserFactory(is_staff=False)
diff --git a/openedx/core/djangoapps/external_user_ids/apps.py b/openedx/core/djangoapps/external_user_ids/apps.py
index abf154abc3fb..4d3c6ca09a57 100644
--- a/openedx/core/djangoapps/external_user_ids/apps.py
+++ b/openedx/core/djangoapps/external_user_ids/apps.py
@@ -11,6 +11,3 @@ class ExternalUserIDConfig(AppConfig):
     Default configuration for the "openedx.core.djangoapps.credit" Django application.
     """
     name = 'openedx.core.djangoapps.external_user_ids'
-
-    def ready(self):
-        from . import signals  # pylint: disable=unused-import
diff --git a/openedx/core/djangoapps/external_user_ids/models.py b/openedx/core/djangoapps/external_user_ids/models.py
index 1c4b3943e272..09fe47c4f317 100644
--- a/openedx/core/djangoapps/external_user_ids/models.py
+++ b/openedx/core/djangoapps/external_user_ids/models.py
@@ -20,7 +20,7 @@ class ExternalIdType(TimeStampedModel):
 
     .. no_pii:
     """
-    MICROBACHELORS_COACHING = 'mb_coaching'
+
     CALIPER = 'caliper'
     XAPI = 'xapi'
     LTI = 'lti'
diff --git a/openedx/core/djangoapps/external_user_ids/signals.py b/openedx/core/djangoapps/external_user_ids/signals.py
deleted file mode 100644
index 166303d12bec..000000000000
--- a/openedx/core/djangoapps/external_user_ids/signals.py
+++ /dev/null
@@ -1,64 +0,0 @@
-"""
-Signal Handlers for External User Ids to be created and maintainer
-"""
-
-from logging import getLogger
-
-from django.db.models.signals import post_save
-from django.dispatch import receiver
-
-from openedx.core.djangoapps.catalog.utils import get_programs
-
-from .models import ExternalId, ExternalIdType
-
-LOGGER = getLogger(__name__)
-
-
-def _user_needs_external_id(instance, created):
-    return (
-        created and
-        instance.user and
-        not ExternalId.user_has_external_id(
-            user=instance.user,
-            type_name=ExternalIdType.MICROBACHELORS_COACHING)
-    )
-
-
-@receiver(post_save, sender='student.CourseEnrollment')
-def create_external_id_for_microbachelors_program(
-    sender, instance, created, **kwargs  # pylint: disable=unused-argument
-):
-    """
-    Watches for post_save signal for creates on the CourseEnrollment table.
-    Generate an External ID if the Enrollment is in a MicroBachelors Program
-    """
-    if _user_needs_external_id(instance, created):
-        mb_programs = [
-            program for program in get_programs(course=instance.course_id)
-            if program.get('type_attrs', {}).get('coaching_supported')
-        ]
-        if mb_programs:
-            ExternalId.add_new_user_id(
-                user=instance.user,
-                type_name=ExternalIdType.MICROBACHELORS_COACHING
-            )
-
-
-@receiver(post_save, sender='entitlements.CourseEntitlement')
-def create_external_id_for_microbachelors_program_entitlement(
-    sender, instance, created, **kwargs  # pylint: disable=unused-argument
-):
-    """
-    Watches for post_save signal for creates on the CourseEntitlement table.
-    Generate an External ID if the Entitlement is in a MicroBachelors Program
-    """
-    if _user_needs_external_id(instance, created):
-        mb_programs = [
-            program for program in get_programs(catalog_course_uuid=instance.course_uuid)
-            if program.get('type_attrs', {}).get('coaching_supported')
-        ]
-        if mb_programs:
-            ExternalId.add_new_user_id(
-                user=instance.user,
-                type_name=ExternalIdType.MICROBACHELORS_COACHING
-            )
diff --git a/openedx/core/djangoapps/external_user_ids/tests/factories.py b/openedx/core/djangoapps/external_user_ids/tests/factories.py
index 86aa747bfe86..aaafe27959a9 100644
--- a/openedx/core/djangoapps/external_user_ids/tests/factories.py
+++ b/openedx/core/djangoapps/external_user_ids/tests/factories.py
@@ -14,7 +14,7 @@ class ExternalIDTypeFactory(factory.django.DjangoModelFactory):  # lint-amnesty,
     class Meta:
         model = ExternalIdType
 
-    name = FuzzyChoice([ExternalIdType.MICROBACHELORS_COACHING])
+    name = FuzzyChoice([ExternalIdType.CALIPER])
     description = FuzzyText()
 
 
diff --git a/openedx/core/djangoapps/external_user_ids/tests/test_signals.py b/openedx/core/djangoapps/external_user_ids/tests/test_signals.py
deleted file mode 100644
index 290c3a27ac11..000000000000
--- a/openedx/core/djangoapps/external_user_ids/tests/test_signals.py
+++ /dev/null
@@ -1,192 +0,0 @@
-"""
-Signal Tests for External User Ids that are sent out of Open edX
-"""
-
-from opaque_keys.edx.keys import CourseKey
-from django.core.cache import cache
-from edx_django_utils.cache import RequestCache
-
-from common.djangoapps.entitlements.models import CourseEntitlement
-from openedx.core.djangoapps.catalog.tests.factories import (
-    CourseFactory,
-    ProgramFactory,
-)
-from common.djangoapps.student.tests.factories import TEST_PASSWORD, UserFactory, CourseEnrollmentFactory
-from openedx.core.djangoapps.catalog.cache import (
-    CATALOG_COURSE_PROGRAMS_CACHE_KEY_TPL,
-    COURSE_PROGRAMS_CACHE_KEY_TPL,
-    PROGRAM_CACHE_KEY_TPL,
-)
-from openedx.core.djangoapps.external_user_ids.models import ExternalId, ExternalIdType
-from common.djangoapps.student.models import CourseEnrollment
-from common.djangoapps.course_modes.models import CourseMode
-
-from openedx.core.djangolib.testing.utils import CacheIsolationTestCase
-from xmodule.modulestore.tests.django_utils import ModuleStoreTestCase  # lint-amnesty, pylint: disable=wrong-import-order
-
-
-class MicrobachelorsExternalIDTest(ModuleStoreTestCase, CacheIsolationTestCase):
-    """
-    Test cases for Signals for External User Ids
-    """
-    ENABLED_CACHES = ['default']
-
-    @classmethod
-    def setUpClass(cls):
-        super().setUpClass()
-
-        cls.course_list = []
-        cls.user = UserFactory.create()
-        cls.course_keys = [
-            CourseKey.from_string('course-v1:edX+DemoX+Test_Course'),
-            CourseKey.from_string('course-v1:edX+DemoX+Another_Test_Course'),
-        ]
-        ExternalIdType.objects.create(
-            name=ExternalIdType.MICROBACHELORS_COACHING,
-            description='test'
-        )
-
-    def setUp(self):
-        super().setUp()
-        RequestCache.clear_all_namespaces()
-        self.program = self._create_cached_program()
-        self.client.login(username=self.user.username, password=TEST_PASSWORD)
-
-    def _create_cached_program(self):
-        """ helper method to create a cached program """
-        program = ProgramFactory.create()
-
-        for course_key in self.course_keys:
-            program['courses'].append(CourseFactory(id=course_key))
-
-        program['type'] = 'MicroBachelors'
-        program['type_attrs']['coaching_supported'] = True
-
-        for course in program['courses']:
-            cache.set(
-                CATALOG_COURSE_PROGRAMS_CACHE_KEY_TPL.format(course_uuid=course['uuid']),
-                [program['uuid']],
-                None
-            )
-
-            course_run = course['course_runs'][0]['key']
-            cache.set(
-                COURSE_PROGRAMS_CACHE_KEY_TPL.format(course_run_id=course_run),
-                [program['uuid']],
-                None
-            )
-        cache.set(
-            PROGRAM_CACHE_KEY_TPL.format(uuid=program['uuid']),
-            program,
-            None
-        )
-
-        return program
-
-    def test_enroll_mb_create_external_id(self):
-        course_run_key = self.program['courses'][0]['course_runs'][0]['key']
-
-        # Enroll user
-        enrollment = CourseEnrollmentFactory.create(
-            course_id=course_run_key,
-            user=self.user,
-            mode=CourseMode.VERIFIED,
-        )
-        enrollment.save()
-        external_id = ExternalId.objects.get(
-            user=self.user
-        )
-        assert external_id is not None
-        assert external_id.external_id_type.name == ExternalIdType.MICROBACHELORS_COACHING
-
-    def test_second_enroll_mb_no_new_external_id(self):
-        course_run_key1 = self.program['courses'][0]['course_runs'][0]['key']
-        course_run_key2 = self.program['courses'][1]['course_runs'][0]['key']
-
-        # Enroll user
-        CourseEnrollmentFactory.create(
-            course_id=course_run_key1,
-            user=self.user,
-            mode=CourseMode.VERIFIED,
-        )
-        external_id = ExternalId.objects.get(
-            user=self.user
-        )
-        assert external_id is not None
-        assert external_id.external_id_type.name == ExternalIdType.MICROBACHELORS_COACHING
-        original_external_user_uuid = external_id.external_user_id
-
-        CourseEnrollmentFactory.create(
-            course_id=course_run_key2,
-            user=self.user,
-            mode=CourseMode.VERIFIED,
-        )
-        enrollments = CourseEnrollment.objects.filter(user=self.user)
-
-        assert len(enrollments) == 2
-
-        external_ids = ExternalId.objects.filter(
-            user=self.user
-        )
-
-        assert len(external_ids) == 1
-        assert external_ids[0].external_id_type.name == ExternalIdType.MICROBACHELORS_COACHING
-        assert original_external_user_uuid == external_ids[0].external_user_id
-
-    def test_entitlement_mb_create_external_id(self):
-        catalog_course = self.program['courses'][0]
-
-        assert ExternalId.objects.filter(
-            user=self.user
-        ).count() == 0
-
-        entitlement = CourseEntitlement.objects.create(
-            course_uuid=catalog_course['uuid'],
-            mode=CourseMode.VERIFIED,
-            user=self.user,
-            order_number='TEST-12345'
-        )
-        entitlement.save()
-
-        external_id = ExternalId.objects.get(
-            user=self.user
-        )
-        assert external_id is not None
-        assert external_id.external_id_type.name == ExternalIdType.MICROBACHELORS_COACHING
-
-    def test_second_entitlement_mb_no_new_external_id(self):
-        catalog_course1 = self.program['courses'][0]
-        catalog_course2 = self.program['courses'][1]
-
-        # Enroll user
-        entitlement = CourseEntitlement.objects.create(
-            course_uuid=catalog_course1['uuid'],
-            mode=CourseMode.VERIFIED,
-            user=self.user,
-            order_number='TEST-12345'
-        )
-        entitlement.save()
-        external_id = ExternalId.objects.get(
-            user=self.user
-        )
-        assert external_id is not None
-        assert external_id.external_id_type.name == ExternalIdType.MICROBACHELORS_COACHING
-        original_external_user_uuid = external_id.external_user_id
-
-        CourseEntitlement.objects.create(
-            course_uuid=catalog_course2['uuid'],
-            mode=CourseMode.VERIFIED,
-            user=self.user,
-            order_number='TEST-12345'
-        )
-        entitlements = CourseEntitlement.objects.filter(user=self.user)
-
-        assert len(entitlements) == 2
-
-        external_ids = ExternalId.objects.filter(
-            user=self.user
-        )
-
-        assert len(external_ids) == 1
-        assert external_ids[0].external_id_type.name == ExternalIdType.MICROBACHELORS_COACHING
-        assert original_external_user_uuid == external_ids[0].external_user_id
diff --git a/openedx/core/djangoapps/notifications/base_notification.py b/openedx/core/djangoapps/notifications/base_notification.py
index 576283eadc13..619dbb97a2b4 100644
--- a/openedx/core/djangoapps/notifications/base_notification.py
+++ b/openedx/core/djangoapps/notifications/base_notification.py
@@ -3,10 +3,9 @@
 """
 from django.utils.translation import gettext_lazy as _
 
-from .utils import (
-    find_app_in_normalized_apps,
-    find_pref_in_normalized_prefs,
-)
+from .utils import find_app_in_normalized_apps, find_pref_in_normalized_prefs
+
+FILTER_AUDIT_EXPIRED = 'filter_audit_expired'
 
 COURSE_NOTIFICATION_TYPES = {
     'new_comment_on_response': {
@@ -20,6 +19,7 @@
             'replier_name': 'replier name',
         },
         'email_template': '',
+        'filters': [FILTER_AUDIT_EXPIRED]
     },
     'new_comment': {
         'notification_app': 'discussion',
@@ -33,6 +33,7 @@
             'replier_name': 'replier name',
         },
         'email_template': '',
+        'filters': [FILTER_AUDIT_EXPIRED]
     },
     'new_response': {
         'notification_app': 'discussion',
@@ -45,6 +46,7 @@
             'replier_name': 'replier name',
         },
         'email_template': '',
+        'filters': [FILTER_AUDIT_EXPIRED]
     },
     'new_discussion_post': {
         'notification_app': 'discussion',
@@ -61,6 +63,7 @@
             'username': 'Post author name',
         },
         'email_template': '',
+        'filters': [FILTER_AUDIT_EXPIRED]
     },
     'new_question_post': {
         'notification_app': 'discussion',
@@ -77,14 +80,12 @@
             'username': 'Post author name',
         },
         'email_template': '',
+        'filters': [FILTER_AUDIT_EXPIRED]
     },
     'response_on_followed_post': {
         'notification_app': 'discussion',
         'name': 'response_on_followed_post',
         'is_core': True,
-        'web': False,
-        'email': False,
-        'push': False,
         'info': '',
         'non_editable': [],
         'content_template': _('<{p}><{strong}>{replier_name}</{strong}> responded to a post you’re following: '
@@ -94,14 +95,12 @@
             'replier_name': 'replier name',
         },
         'email_template': '',
+        'filters': [FILTER_AUDIT_EXPIRED]
     },
     'comment_on_followed_post': {
         'notification_app': 'discussion',
         'name': 'comment_on_followed_post',
         'is_core': True,
-        'web': False,
-        'email': False,
-        'push': False,
         'info': '',
         'non_editable': [],
         'content_template': _('<{p}><{strong}>{replier_name}</{strong}> commented on {author_name}\'s response in '
@@ -112,6 +111,7 @@
             'replier_name': 'replier name',
         },
         'email_template': '',
+        'filters': [FILTER_AUDIT_EXPIRED]
     },
 }
 
diff --git a/openedx/core/djangoapps/notifications/config/waffle.py b/openedx/core/djangoapps/notifications/config/waffle.py
index fdfd74571c47..51c4df6e402b 100644
--- a/openedx/core/djangoapps/notifications/config/waffle.py
+++ b/openedx/core/djangoapps/notifications/config/waffle.py
@@ -27,3 +27,23 @@
 # .. toggle_target_removal_date: 2023-12-07
 # .. toggle_tickets: INF-902
 SHOW_NOTIFICATIONS_TRAY = CourseWaffleFlag(f"{WAFFLE_NAMESPACE}.show_notifications_tray", __name__)
+
+# .. toggle_name: notifications.enable_notifications_filters
+# .. toggle_implementation: CourseWaffleFlag
+# .. toggle_default: False
+# .. toggle_description: Waffle flag to enable filters in notifications task
+# .. toggle_use_cases: temporary, open_edx
+# .. toggle_creation_date: 2023-06-07
+# .. toggle_target_removal_date: 2024-06-01
+# .. toggle_tickets: INF-902
+ENABLE_NOTIFICATIONS_FILTERS = CourseWaffleFlag(f"{WAFFLE_NAMESPACE}.enable_notifications_filters", __name__)
+
+# .. toggle_name: notifications.enable_coursewide_notifications
+# .. toggle_implementation: CourseWaffleFlag
+# .. toggle_default: False
+# .. toggle_description: Waffle flag to enable coursewide notifications
+# .. toggle_use_cases: temporary, open_edx
+# .. toggle_creation_date: 2023-10-25
+# .. toggle_target_removal_date: 2024-06-01
+# .. toggle_tickets: INF-1145
+ENABLE_COURSEWIDE_NOTIFICATIONS = CourseWaffleFlag(f"{WAFFLE_NAMESPACE}.enable_coursewide_notifications", __name__)
diff --git a/openedx/core/djangoapps/notifications/events.py b/openedx/core/djangoapps/notifications/events.py
index 61db83d0e721..e76149f1c475 100644
--- a/openedx/core/djangoapps/notifications/events.py
+++ b/openedx/core/djangoapps/notifications/events.py
@@ -62,7 +62,8 @@ def notification_preferences_viewed_event(request, course_id):
         )
 
 
-def notification_generated_event(user_ids, app_name, notification_type, course_key, content_url, content):
+def notification_generated_event(user_ids, app_name, notification_type, course_key,
+                                 content_url, content, sender_id=None):
     """
     Emit an event when a notification is generated.
     """
@@ -78,6 +79,7 @@ def notification_generated_event(user_ids, app_name, notification_type, course_k
         'notification_app': app_name,
         'content_url': content_url,
         'notification_content': content,
+        'sender_id': sender_id,
     }
     with tracker.get_tracker().context(NOTIFICATION_GENERATED, context):
         tracker.emit(
diff --git a/openedx/core/djangoapps/notifications/filters.py b/openedx/core/djangoapps/notifications/filters.py
new file mode 100644
index 000000000000..ea71f276d2c3
--- /dev/null
+++ b/openedx/core/djangoapps/notifications/filters.py
@@ -0,0 +1,70 @@
+"""
+Notification filters
+"""
+import logging
+
+from django.utils import timezone
+
+from common.djangoapps.course_modes.models import CourseMode
+from common.djangoapps.student.models import CourseEnrollment
+from openedx.core.djangoapps.course_date_signals.utils import get_expected_duration
+from openedx.core.djangoapps.notifications.base_notification import COURSE_NOTIFICATION_TYPES
+from openedx.features.course_duration_limits.models import CourseDurationLimitConfig
+from xmodule.modulestore.django import modulestore
+
+logger = logging.getLogger(__name__)
+
+
+class NotificationFilter:
+    """
+    Filter notifications based on their type
+    """
+
+    @staticmethod
+    def filter_audit_expired(user_ids, course) -> list:
+        """
+        Check if the user has access to the course
+        """
+        verified_mode = CourseMode.verified_mode_for_course(course=course, include_expired=True)
+        access_duration = get_expected_duration(course.id)
+        course_time_limit = CourseDurationLimitConfig.current(course_key=course.id)
+        if not verified_mode:
+            logger.info(
+                "NotificationFilter: Course %s does not have a verified mode, so no users will be filtered out",
+                course.id,
+            )
+            return user_ids
+        enrollments = CourseEnrollment.objects.filter(
+            user_id__in=user_ids,
+            course_id=course.id,
+            mode=CourseMode.AUDIT,
+        )
+        if course_time_limit.enabled_for_course(course.id):
+            enrollments = enrollments.filter(created__gte=course_time_limit.enabled_as_of)
+        logger.info("NotificationFilter: Number of audit enrollments for course %s: %s", course.id, enrollments.count())
+        for enrollment in enrollments:
+            content_availability_date = max(enrollment.created, course.start)
+            expiration_date = content_availability_date + access_duration
+            logger.info("NotificationFilter: content_availability_date: %s and access_duration: %s",
+                        content_availability_date, access_duration
+                        )
+            if expiration_date and timezone.now() > expiration_date:
+                logger.info("User %s has expired audit access to course %s", enrollment.user_id, course.id)
+                user_ids.remove(enrollment.user_id)
+        return user_ids
+
+    def apply_filters(self, user_ids, course_key, notification_type) -> list:
+        """
+        Apply all the filters
+        """
+        notification_config = COURSE_NOTIFICATION_TYPES.get(notification_type, {})
+        applicable_filters = notification_config.get('filters', [])
+        course = modulestore().get_course(course_key)
+        for filter_name in applicable_filters:
+            logger.info(
+                "NotificationFilter: Applying filter %s for notification type %s",
+                filter_name,
+                notification_type,
+            )
+            user_ids = getattr(self, filter_name)(user_ids, course)
+        return user_ids
diff --git a/openedx/core/djangoapps/notifications/models.py b/openedx/core/djangoapps/notifications/models.py
index 66bd3a109b80..55f6c11a7cac 100644
--- a/openedx/core/djangoapps/notifications/models.py
+++ b/openedx/core/djangoapps/notifications/models.py
@@ -21,7 +21,7 @@
 NOTIFICATION_CHANNELS = ['web', 'push', 'email']
 
 # Update this version when there is a change to any course specific notification type or app.
-COURSE_NOTIFICATION_CONFIG_VERSION = 3
+COURSE_NOTIFICATION_CONFIG_VERSION = 4
 
 
 def get_course_notification_preference_config():
diff --git a/openedx/core/djangoapps/notifications/tasks.py b/openedx/core/djangoapps/notifications/tasks.py
index 1401a2d9ab17..2a3766d41cdc 100644
--- a/openedx/core/djangoapps/notifications/tasks.py
+++ b/openedx/core/djangoapps/notifications/tasks.py
@@ -14,8 +14,9 @@
 
 from common.djangoapps.student.models import CourseEnrollment
 from openedx.core.djangoapps.notifications.base_notification import get_default_values_of_preference
-from openedx.core.djangoapps.notifications.config.waffle import ENABLE_NOTIFICATIONS
+from openedx.core.djangoapps.notifications.config.waffle import ENABLE_NOTIFICATIONS, ENABLE_NOTIFICATIONS_FILTERS
 from openedx.core.djangoapps.notifications.events import notification_generated_event
+from openedx.core.djangoapps.notifications.filters import NotificationFilter
 from openedx.core.djangoapps.notifications.models import (
     CourseNotificationPreference,
     Notification,
@@ -91,14 +92,22 @@ def send_notifications(user_ids, course_key: str, app_name, notification_type, c
     course_key = CourseKey.from_string(course_key)
     if not ENABLE_NOTIFICATIONS.is_enabled(course_key):
         return
+
     user_ids = list(set(user_ids))
     batch_size = settings.NOTIFICATION_CREATION_BATCH_SIZE
 
-    audience = []
     notifications_generated = False
     notification_content = ''
-    default_web_config = get_default_values_of_preference(app_name, notification_type).get('web', True)
+    sender_id = context.pop('sender_id', None)
+    default_web_config = get_default_values_of_preference(app_name, notification_type).get('web', False)
+    generated_notification_audience = []
+
     for batch_user_ids in get_list_in_batches(user_ids, batch_size):
+        if ENABLE_NOTIFICATIONS_FILTERS.is_enabled(course_key):
+            logger.info(f'Sending notifications to {len(batch_user_ids)} users in {course_key}')
+            batch_user_ids = NotificationFilter().apply_filters(batch_user_ids, course_key, notification_type)
+            logger.info(f'After applying filters, sending notifications to {len(batch_user_ids)} users in {course_key}')
+
         # check if what is preferences of user and make decision to send notification or not
         preferences = CourseNotificationPreference.objects.filter(
             user_id__in=batch_user_ids,
@@ -109,9 +118,13 @@ def send_notifications(user_ids, course_key: str, app_name, notification_type, c
         if default_web_config:
             preferences = create_notification_pref_if_not_exists(batch_user_ids, preferences, course_key)
 
+        if not preferences:
+            continue
+
         notifications = []
         for preference in preferences:
-            preference = update_user_preference(preference, preference.user_id, course_key)
+            user_id = preference.user_id
+            preference = update_user_preference(preference, user_id, course_key)
             if (
                 preference and
                 preference.get_web_config(app_name, notification_type) and
@@ -119,7 +132,7 @@ def send_notifications(user_ids, course_key: str, app_name, notification_type, c
             ):
                 notifications.append(
                     Notification(
-                        user_id=preference.user_id,
+                        user_id=user_id,
                         app_name=app_name,
                         notification_type=notification_type,
                         content_context=context,
@@ -127,7 +140,8 @@ def send_notifications(user_ids, course_key: str, app_name, notification_type, c
                         course_id=course_key,
                     )
                 )
-                audience.append(preference.user_id)
+                generated_notification_audience.append(user_id)
+
         # send notification to users but use bulk_create
         notification_objects = Notification.objects.bulk_create(notifications)
         if notification_objects and not notifications_generated:
@@ -135,8 +149,11 @@ def send_notifications(user_ids, course_key: str, app_name, notification_type, c
             notification_content = notification_objects[0].content
 
     if notifications_generated:
+        logger.info(f'Temp: Notifications generated for {len(generated_notification_audience)} out of '
+                    f'{len(user_ids)} users - {app_name} - {notification_type} - {course_key}.')
         notification_generated_event(
-            audience, app_name, notification_type, course_key, content_url, notification_content,
+            generated_notification_audience, app_name, notification_type, course_key, content_url,
+            notification_content, sender_id=sender_id
         )
 
 
diff --git a/openedx/core/djangoapps/notifications/tests/test_filters.py b/openedx/core/djangoapps/notifications/tests/test_filters.py
new file mode 100644
index 000000000000..d1aff28de702
--- /dev/null
+++ b/openedx/core/djangoapps/notifications/tests/test_filters.py
@@ -0,0 +1,96 @@
+"""
+Test for the NotificationFilter class.
+"""
+from datetime import timedelta
+from unittest import mock
+
+import ddt
+from django.utils.timezone import now
+
+from common.djangoapps.course_modes.models import CourseMode
+from common.djangoapps.student.models import CourseEnrollment
+from common.djangoapps.student.tests.factories import UserFactory
+from openedx.core.djangoapps.content.course_overviews.models import CourseOverview
+from openedx.core.djangoapps.notifications.filters import NotificationFilter
+from openedx.features.course_duration_limits.models import CourseDurationLimitConfig
+from openedx.features.course_experience.tests.views.helpers import add_course_mode
+from xmodule.modulestore.tests.django_utils import ModuleStoreTestCase
+from xmodule.modulestore.tests.factories import CourseFactory
+
+
+@ddt.ddt
+class CourseExpirationTestCase(ModuleStoreTestCase):
+    """Tests to verify the get_user_course_expiration_date function is working correctly"""
+
+    def setUp(self):
+        super().setUp()  # lint-amnesty, pylint: disable=super-with-arguments
+        self.course = CourseFactory(
+            start=now() - timedelta(weeks=10),
+        )
+
+        self.user = UserFactory()
+        self.user_1 = UserFactory()
+
+        # Make this a verified course, so we can test expiration date
+        add_course_mode(self.course, mode_slug=CourseMode.AUDIT)
+        add_course_mode(self.course)
+        CourseEnrollment.enroll(self.user, self.course.id, CourseMode.AUDIT)
+        expired_audit = CourseEnrollment.enroll(self.user, self.course.id, CourseMode.AUDIT)
+        expired_audit.created = now() - timedelta(weeks=6)
+        expired_audit.save()
+
+    @mock.patch("openedx.core.djangoapps.course_date_signals.utils.get_course_run_details")
+    def test_audit_expired_filter(
+        self,
+        mock_get_course_run_details,
+    ):
+        """
+        Test if filter_audit_expired function is working correctly
+        """
+
+        mock_get_course_run_details.return_value = {'weeks_to_complete': 4}
+        result = NotificationFilter.filter_audit_expired(
+            [self.user.id, self.user_1.id],
+            self.course,
+        )
+        self.assertEqual([self.user_1.id], result)
+
+        mock_get_course_run_details.return_value = {'weeks_to_complete': 7}
+        result = NotificationFilter.filter_audit_expired(
+            [self.user.id, self.user_1.id],
+            self.course,
+        )
+        self.assertEqual([self.user.id, self.user_1.id], result)
+
+        CourseDurationLimitConfig.objects.create(
+            enabled=True,
+            course=CourseOverview.get_from_id(self.course.id),
+            enabled_as_of=now(),
+        )
+        # weeks_to_complete is set to 4 because we want to test if CourseDurationLimitConfig is working correctly.
+        mock_get_course_run_details.return_value = {'weeks_to_complete': 4}
+        result = NotificationFilter.filter_audit_expired(
+            [self.user.id, self.user_1.id],
+            self.course,
+        )
+        self.assertEqual([self.user.id, self.user_1.id], result)
+
+    @mock.patch("openedx.core.djangoapps.course_date_signals.utils.get_course_run_details")
+    @mock.patch("openedx.core.djangoapps.notifications.filters.NotificationFilter.filter_audit_expired")
+    def test_apply_filter(
+        self,
+        mock_filter_audit_expired,
+        mock_get_course_run_details,
+    ):
+        """
+        Test if apply_filter function is working correctly
+        """
+        mock_get_course_run_details.return_value = {'weeks_to_complete': 4}
+        mock_filter_audit_expired.return_value = [self.user.id, self.user_1.id]
+        result = NotificationFilter().apply_filters(
+            [self.user.id, self.user_1.id],
+            self.course.id,
+            'new_comment_on_response'
+        )
+        self.assertEqual([self.user.id, self.user_1.id], result)
+        mock_filter_audit_expired.assert_called_once()
diff --git a/openedx/core/djangoapps/notifications/tests/test_tasks.py b/openedx/core/djangoapps/notifications/tests/test_tasks.py
index 3164f9a9bae2..98b90e7b4b81 100644
--- a/openedx/core/djangoapps/notifications/tests/test_tasks.py
+++ b/openedx/core/djangoapps/notifications/tests/test_tasks.py
@@ -124,7 +124,12 @@ def test_send_notifications(self, app_name, notification_type):
         content_url = 'https://example.com/'
 
         # Call the `send_notifications` function.
-        send_notifications([self.user.id], str(self.course_1.id), app_name, notification_type, context, content_url)
+        with patch('openedx.core.djangoapps.notifications.tasks.notification_generated_event') as event_mock:
+            send_notifications([self.user.id], str(self.course_1.id), app_name, notification_type, context, content_url)
+            assert event_mock.called
+            assert event_mock.call_args[0][0] == [self.user.id]
+            assert event_mock.call_args[0][1] == app_name
+            assert event_mock.call_args[0][2] == notification_type
 
         # Assert that `Notification` objects have been created for the users.
         notification = Notification.objects.filter(user_id=self.user.id).first()
@@ -164,6 +169,7 @@ def test_send_with_app_disabled_notifications(self, app_name, notification_type)
 
 
 @ddt.ddt
+@patch('openedx.core.djangoapps.notifications.tasks.ENABLE_NOTIFICATIONS_FILTERS.is_enabled', lambda x: False)
 class SendBatchNotificationsTest(ModuleStoreTestCase):
     """
     Test that notification and notification preferences are created in batches
diff --git a/openedx/core/djangoapps/notifications/tests/test_views.py b/openedx/core/djangoapps/notifications/tests/test_views.py
index 677d72fc84c9..e09b4989d537 100644
--- a/openedx/core/djangoapps/notifications/tests/test_views.py
+++ b/openedx/core/djangoapps/notifications/tests/test_views.py
@@ -18,7 +18,11 @@
 from common.djangoapps.student.models import CourseEnrollment
 from common.djangoapps.student.tests.factories import UserFactory
 from openedx.core.djangoapps.content.course_overviews.tests.factories import CourseOverviewFactory
-from openedx.core.djangoapps.notifications.config.waffle import ENABLE_NOTIFICATIONS, SHOW_NOTIFICATIONS_TRAY
+from openedx.core.djangoapps.notifications.config.waffle import (
+    ENABLE_COURSEWIDE_NOTIFICATIONS,
+    ENABLE_NOTIFICATIONS,
+    SHOW_NOTIFICATIONS_TRAY
+)
 from openedx.core.djangoapps.notifications.models import CourseNotificationPreference, Notification
 from openedx.core.djangoapps.notifications.serializers import NotificationCourseEnrollmentSerializer
 from xmodule.modulestore.tests.django_utils import ModuleStoreTestCase
@@ -73,7 +77,7 @@ def test_course_enrollment_list_view(self, show_notifications_tray):
         """
         Test the CourseEnrollmentListView.
         """
-        self.client.login(username=self.user.username, password='test')
+        self.client.login(username=self.user.username, password=self.TEST_PASSWORD)
         # Enable or disable the waffle flag based on the test case data
         with override_waffle_flag(SHOW_NOTIFICATIONS_TRAY, active=show_notifications_tray):
             url = reverse('enrollment-list')
@@ -254,8 +258,9 @@ def test_get_user_notification_preference(self, mock_emit):
         """
         Test get user notification preference.
         """
-        self.client.login(username=self.user.username, password='test')
-        response = self.client.get(self.path)
+        self.client.login(username=self.user.username, password=self.TEST_PASSWORD)
+        with override_waffle_flag(ENABLE_COURSEWIDE_NOTIFICATIONS, active=True):
+            response = self.client.get(self.path)
         self.assertEqual(response.status_code, status.HTTP_200_OK)
         self.assertEqual(response.data, self._expected_api_response())
         event_name, event_data = mock_emit.call_args[0]
@@ -280,7 +285,7 @@ def test_patch_user_notification_preference(
         """
         Test update of user notification preference.
         """
-        self.client.login(username=self.user.username, password='test')
+        self.client.login(username=self.user.username, password=self.TEST_PASSWORD)
         payload = {
             'notification_app': notification_app,
             'value': value,
@@ -325,7 +330,8 @@ class NotificationListAPIViewTest(APITestCase):
     """
 
     def setUp(self):
-        self.user = UserFactory()
+        self.TEST_PASSWORD = 'Password1234'
+        self.user = UserFactory(password=self.TEST_PASSWORD)
         self.url = reverse('notifications-list')
 
     def test_list_notifications(self):
@@ -342,7 +348,7 @@ def test_list_notifications(self):
                 'post_title': 'This is a test post.',
             }
         )
-        self.client.login(username=self.user.username, password='test')
+        self.client.login(username=self.user.username, password=self.TEST_PASSWORD)
 
         # Make a request to the view.
         response = self.client.get(self.url)
@@ -379,7 +385,7 @@ def test_list_notifications_with_app_name_filter(self):
             app_name='app2',
             notification_type='info',
         )
-        self.client.login(username=self.user.username, password='test')
+        self.client.login(username=self.user.username, password=self.TEST_PASSWORD)
 
         # Make a request to the view with the app_name query parameter set to 'app1'.
         response = self.client.get(self.url + "?app_name=discussion")
@@ -402,7 +408,7 @@ def test_list_notifications_with_tray_opened_param(self, mock_emit):
         """
         Test event emission with tray_opened param is provided.
         """
-        self.client.login(username=self.user.username, password='test')
+        self.client.login(username=self.user.username, password=self.TEST_PASSWORD)
 
         # Make a request to the view with the tray_opened query parameter set to True.
         response = self.client.get(self.url + "?tray_opened=True")
@@ -442,7 +448,7 @@ def test_list_notifications_with_expiry_date(self):
             notification_type='info',
             created=today - timedelta(days=settings.NOTIFICATIONS_EXPIRY)
         )
-        self.client.login(username=self.user.username, password='test')
+        self.client.login(username=self.user.username, password=self.TEST_PASSWORD)
 
         # Make a request to the view
         response = self.client.get(self.url)
@@ -469,7 +475,7 @@ def test_list_notifications_with_order_by_reverse_id(self):
             user=self.user,
             notification_type='info',
         )
-        self.client.login(username=self.user.username, password='test')
+        self.client.login(username=self.user.username, password=self.TEST_PASSWORD)
 
         # Make a request to the view
         response = self.client.get(self.url)
@@ -523,7 +529,7 @@ def test_get_unseen_notifications_count_with_show_notifications_tray(self, show_
         """
         Test that the endpoint returns the correct count of unseen notifications and show_notifications_tray value.
         """
-        self.client.login(username=self.user.username, password='test')
+        self.client.login(username=self.user.username, password=self.TEST_PASSWORD)
 
         # Enable or disable the waffle flag based on the test case data
         with override_waffle_flag(SHOW_NOTIFICATIONS_TRAY, active=show_notifications_tray_enabled):
@@ -550,7 +556,7 @@ def test_get_unseen_notifications_count_for_user_with_no_notifications(self):
         """
         # Create a user with no notifications.
         user = UserFactory()
-        self.client.login(username=user.username, password='test')
+        self.client.login(username=user.username, password=self.TEST_PASSWORD)
         response = self.client.get(self.url)
 
         self.assertEqual(response.status_code, 200)
@@ -562,7 +568,7 @@ def test_get_expiry_days_in_count_view(self):
         Tests if "notification_expiry_days" exists in API response
         """
         user = UserFactory()
-        self.client.login(username=user.username, password='test')
+        self.client.login(username=user.username, password=self.TEST_PASSWORD)
         response = self.client.get(self.url)
         self.assertEqual(response.status_code, 200)
         self.assertEqual(response.data['notification_expiry_days'], 60)
@@ -574,7 +580,8 @@ class MarkNotificationsSeenAPIViewTestCase(APITestCase):
     """
 
     def setUp(self):
-        self.user = UserFactory()
+        self.TEST_PASSWORD = 'Password1234'
+        self.user = UserFactory(password=self.TEST_PASSWORD)
 
         # Create some sample notifications for the user
         Notification.objects.create(user=self.user, app_name='App Name 1', notification_type='Type A')
@@ -586,7 +593,7 @@ def test_mark_notifications_seen(self):
         # Create a POST request to mark notifications as seen for 'App Name 1'
         app_name = 'App Name 1'
         url = reverse('mark-notifications-seen', kwargs={'app_name': app_name})
-        self.client.login(username=self.user.username, password='test')
+        self.client.login(username=self.user.username, password=self.TEST_PASSWORD)
         response = self.client.put(url)
         # Assert the response status code is 200 (OK)
         self.assertEqual(response.status_code, status.HTTP_200_OK)
@@ -606,9 +613,10 @@ class NotificationReadAPIViewTestCase(APITestCase):
     """
 
     def setUp(self):
-        self.user = UserFactory()
+        self.TEST_PASSWORD = 'Password1234'
+        self.user = UserFactory(password=self.TEST_PASSWORD)
         self.url = reverse('notifications-read')
-        self.client.login(username=self.user.username, password='test')
+        self.client.login(username=self.user.username, password=self.TEST_PASSWORD)
 
         # Create some sample notifications for the user with already existing apps and with invalid app name
         Notification.objects.create(user=self.user, app_name='app_name_2', notification_type='Type A')
@@ -665,7 +673,7 @@ def test_mark_notification_read_with_other_user_notification_id(self):
         # Create a PATCH request to mark notification as read for notification_id: 2 through a different user
         self.client.logout()
         self.user = UserFactory()
-        self.client.login(username=self.user.username, password='test')
+        self.client.login(username=self.user.username, password=self.TEST_PASSWORD)
 
         notification_id = 2
         data = {'notification_id': notification_id}
diff --git a/openedx/core/djangoapps/notifications/utils.py b/openedx/core/djangoapps/notifications/utils.py
index 39bf8755da8e..597ed59f0a5d 100644
--- a/openedx/core/djangoapps/notifications/utils.py
+++ b/openedx/core/djangoapps/notifications/utils.py
@@ -3,7 +3,7 @@
 """
 from common.djangoapps.student.models import CourseEnrollment
 
-from .config.waffle import SHOW_NOTIFICATIONS_TRAY
+from .config.waffle import ENABLE_COURSEWIDE_NOTIFICATIONS, SHOW_NOTIFICATIONS_TRAY
 
 
 def find_app_in_normalized_apps(app_name, apps_list):
@@ -51,3 +51,20 @@ def get_list_in_batches(input_list, batch_size):
     list_length = len(input_list)
     for index in range(0, list_length, batch_size):
         yield input_list[index: index + batch_size]
+
+
+def filter_course_wide_preferences(course_key, preferences):
+    """
+    If course wide notifications is disabled for course, it filters course_wide
+    preferences from response
+    """
+    if ENABLE_COURSEWIDE_NOTIFICATIONS.is_enabled(course_key):
+        return preferences
+    course_wide_notification_types = ['new_discussion_post', 'new_question_post']
+    config = preferences['notification_preference_config']
+    for app_prefs in config.values():
+        notification_types = app_prefs['notification_types']
+        for course_wide_type in course_wide_notification_types:
+            if course_wide_type in notification_types.keys():
+                notification_types.pop(course_wide_type)
+    return preferences
diff --git a/openedx/core/djangoapps/notifications/views.py b/openedx/core/djangoapps/notifications/views.py
index 6d82f67f0120..810aa7492825 100644
--- a/openedx/core/djangoapps/notifications/views.py
+++ b/openedx/core/djangoapps/notifications/views.py
@@ -36,7 +36,7 @@
     UserCourseNotificationPreferenceSerializer,
     UserNotificationPreferenceUpdateSerializer
 )
-from .utils import get_show_notifications_tray
+from .utils import filter_course_wide_preferences, get_show_notifications_tray
 
 
 @allow_any_authenticated_user()
@@ -183,7 +183,8 @@ def get(self, request, course_key_string):
         user_preference = CourseNotificationPreference.get_updated_user_course_preferences(request.user, course_id)
         serializer = UserCourseNotificationPreferenceSerializer(user_preference)
         notification_preferences_viewed_event(request, course_id)
-        return Response(serializer.data)
+        preferences = filter_course_wide_preferences(course_id, serializer.data)
+        return Response(preferences)
 
     def patch(self, request, course_key_string):
         """
diff --git a/openedx/core/djangoapps/oauth_dispatch/docs/decisions/0008-use-asymmetric-jwts.rst b/openedx/core/djangoapps/oauth_dispatch/docs/decisions/0008-use-asymmetric-jwts.rst
index d65aaaf4a90a..d85904051607 100644
--- a/openedx/core/djangoapps/oauth_dispatch/docs/decisions/0008-use-asymmetric-jwts.rst
+++ b/openedx/core/djangoapps/oauth_dispatch/docs/decisions/0008-use-asymmetric-jwts.rst
@@ -63,7 +63,7 @@ The code examples below show this in action.
 Remove JWT_ISSUERS
 ~~~~~~~~~~~~~~~~~~
 
-edx_rest_framework_extensions.settings_ supports having a list of **JWT_ISSUERS** instead of just a single
+`edx_rest_framework_extensions.settings`_ supports having a list of **JWT_ISSUERS** instead of just a single
 one. This support for configuring multiple issuers is present across many services. However, this does not
 conform to the `JWT standard`_, where the `issuer`_ is intended to identify the entity that generates and
 signs the JWT. In our case, that should be the single Auth service only.
@@ -81,70 +81,56 @@ issuer, but with (the potential of) multiple signing keys stored in a JWT Set.
 .. _JSON Web Key Set (JWK Set): https://tools.ietf.org/html/draft-ietf-jose-json-web-key-36#section-5
 .. _site configuration: https://github.com/openedx/edx-platform/blob/af841336c7e39d634c238cd8a11c5a3a661aa9e2/openedx/core/djangoapps/site_configuration/__init__.py
 
-Example Code
-------------
+Features
+--------
 
 KeyPair Generation
 ~~~~~~~~~~~~~~~~~~
 
-Here is code for generating a keypair::
-
-    from Cryptodome.PublicKey import RSA
-    from jwkest import jwk
-
-    rsa_key = RSA.generate(2048)
-    rsa_jwk = jwk.RSAKey(kid="your_key_id", key=rsa_key)
-
-To serialize the **public key** in a `JSON Web Key Set (JWK Set)`_::
-
-    public_keys = jwk.KEYS()
-    public_keys.append(rsa_jwk)
-    serialized_public_keys_json = public_keys.dump_jwks()
-
-and its sample output::
-
-    {
-        "keys": [
-            {
-                "kid": "your_key_id",
-                "e": "strawberry",
-                "kty": "RSA",
-                "n": "something"
-            }
-        ]
-    }
-
-To serialize the **keypair** as a JWK::
-
-    serialized_keypair = rsa_jwk.serialize(private=True)
-    serialized_keypair_json = json.dumps(serialized_keypair)
-
-and its sample output::
-
-    {
-        "e": "strawberry",
-        "d": "apple",
-        "n": "banana",
-        "q": "pear",
-        "p": "plum",
-        "kid": "your_key_id",
-        "kty": "RSA"
-    }
+Please have a look at ``openedx/core/djangoapps/oauth_dispatch/management/commands/generate_jwt_signing_key.py``
+to get better understanding how to generate keypair using ``PyJWT``.
+
+The public and private keypair would be similar to the following::
+
+    ## Public keyset
+    """
+        {
+            "keys": [
+                {
+                    "kty": "RSA",
+                    "key_ops": ["verify"],
+                    "n": "...",
+                    "e": "...",
+                    "kid": "your_key_id"
+                }
+            ]
+        }
+    """
+
+
+    ## Private key
+    """
+        {
+            "kty": "RSA",
+            "key_ops": ["sign"],
+            "n": "...",
+            "e": "...",
+            "d": "...",
+            "p": "...",
+            "q": "...",
+            "dp": "...",
+            "dq": "...",
+            "qi": "...",
+            "kid": "your_key_id"
+        }
+    """
 
 Signing
 ~~~~~~~
 
-To deserialize the keypair from above::
-
-    private_keys = jwk.KEYS()
-    serialized_keypair = json.loads(serialized_keypair_json)
-    private_keys.add(serialized_keypair)
+To create a signature you simply need a **payload**, **private key** and your hashing algorithm::
 
-To create a signature::
-
-    from jwkest.jws import JWS
-    jws = JWS("JWT payload", alg="RS512")
-    signed_message = jws.sign_compact(keys=private_keys)
+    signed_message = jwt.encode("JWT payload in dict format", key=private_key, algorithm="RS512")
 
 Note: we specify **RS512** above to identify *RSASSA-PKCS1-v1_5 using SHA-512* as
 the signature algorithm value as described in the `JSON Web Algorithms (JWA)`_ spec.
@@ -154,24 +140,20 @@ the signature algorithm value as described in the `JSON Web Algorithms (JWA)`_ s
 Verify Signature
 ~~~~~~~~~~~~~~~~
 
-To verify the signature from above::
+To verify the signature we'll be looping through the public keys and try to verify the signature with each of them.
+For more details you can have a look at `verify_jwk_signature_using_keyset`_. To generate ``keyset`` required for verification you
+can use `get_verification_jwk_key_set`_ method.
 
-    public_keys = jwk.KEYS()
-    public_keys.load_jwks(serialized_public_keys_json)
-    jws.verify_compact(signed_message, public_keys)
+.. _verify_jwk_signature_using_keyset: https://github.com/openedx/edx-drf-extensions/blob/master/edx_rest_framework_extensions/auth/jwt/decoder.py#L270
+.. _get_verification_jwk_key_set : https://github.com/openedx/edx-drf-extensions/blob/master/edx_rest_framework_extensions/auth/jwt/decoder.py#L395
 
 Key Rotation
 ~~~~~~~~~~~~
 
-When a new public key is added in the future, it should have a unique "kid"
-value and added to the public keys JWK set::
-
-    new_rsa_key = RSA.generate(2048)
-    new_rsa_jwk = jwk.RSAKey(kid="new_id", key=new_rsa_key)
-    public_keys.append(new_rsa_jwk)
-
-When a JWS is created, it is signed with a certain "kid"-identified keypair. When it
-is later verified, the public key with the matching "kid" in the JWK set is used.
+In future if we plan to rotate the keys, we can simply add new key public key to the public keyset and remove the old private one.
+Means, at any time there might be more than one public key but there will be only one private key. Considering that we are doing verification
+by looping through all the available public keys, the ``kid`` parameter is not
+as important as it was before. But it's still recommended to use it. It will help us to differentiate between the old and new public keys.
 
 Consequences
 ------------
diff --git a/openedx/core/djangoapps/oauth_dispatch/docs/decisions/0015-add-scope-user-id-for-jwt.rst b/openedx/core/djangoapps/oauth_dispatch/docs/decisions/0015-add-scope-user-id-for-jwt.rst
new file mode 100644
index 000000000000..4bd15b651734
--- /dev/null
+++ b/openedx/core/djangoapps/oauth_dispatch/docs/decisions/0015-add-scope-user-id-for-jwt.rst
@@ -0,0 +1,36 @@
+15. Add scope user_id for JWT token
+###################################
+
+Status
+------
+
+Accepted
+
+Context
+-------
+
+In Feb 2018, to enable analytics (Segment) from Microfrontends (MFEs), a ``user_id`` claim was added to the JWT token `in this PR<https://github.com/openedx/edx-platform/pull/19765>`__.
+
+The LMS API `to create authentication tokens`_ is used by external organizations to request a token on behalf of their users, mostly using grant_type ``client_credentials`` in the request. Since ``user_id`` is considered sensitive information, especially when combined with email and username which were already available in the JWT, it was decided to only add the ``user_id`` claim when a ``user_id`` scope was supplied. All MFE JWT cookies, which are known to only be used directly by the user, automatically used the ``user_id`` scope in order to get the required ``user_id`` claim.
+
+No ADR could be found for the Feb 2018 decision detailed above.
+
+In June 2019, an `ADR was captured in ecommerce`_ around the requirements to have the LMS user_id available for requests to ecommerce.
+
+In 2022, the mobile apps switched to using JWTs for authentication. However, these JWTs were missing the ``user_id`` scope and claim required by the ecommerce service.
+
+.. _to create authentication tokens: https://github.com/openedx/edx-platform/blob/caf8e456e28f9b9a1f5fa7186d3d155112fb75be/openedx/core/djangoapps/oauth_dispatch/urls.py#L14
+.. _ADR was captured in ecommerce: https://github.com/openedx/ecommerce/blob/master/docs/decisions/0004-unique-identifier-for-users.rst
+
+Decisions
+---------
+
+- The original decision to add the ``user_id`` claim to the JWT token using the ``user_id`` scope has been captured in the context of this ADR, because no ADR could be found.
+- The scope ``user_id`` will be added to all requests having grant_type ``password`` in the API `/oauth2/access_token/`.
+
+Consequences
+------------
+
+- The claim ``user_id`` will be present in the JWT token for all requesters who already have access to the login credentials of the user account.
+- The ``user_id`` scope will continue to protect other JWT requests that don't require this sensitive information.
+- This pattern could potentially be used to clean-up the manually added ``user_id`` scope for oauth clients involved in the social auth flow in the future.
diff --git a/openedx/core/djangoapps/oauth_dispatch/jwt.py b/openedx/core/djangoapps/oauth_dispatch/jwt.py
index 329d28822fca..cf13a2259be3 100644
--- a/openedx/core/djangoapps/oauth_dispatch/jwt.py
+++ b/openedx/core/djangoapps/oauth_dispatch/jwt.py
@@ -5,12 +5,14 @@
 import logging
 from time import time
 
+import jwt
 from django.conf import settings
 from edx_django_utils.monitoring import increment, set_custom_attribute
 from edx_rbac.utils import create_role_auth_claim_for_user
 from edx_toggles.toggles import SettingToggle
-from jwkest import jwk
-from jwkest.jws import JWS
+from jwt import PyJWK
+from jwt.utils import base64url_encode
+from oauth2_provider.models import Application
 
 from common.djangoapps.student.models import UserProfile, anonymous_id_for_user
 
@@ -78,10 +80,11 @@ def create_jwt_token_dict(token_dict, oauth_adapter, use_asymmetric_key=None):
     # .. custom_attribute_name: create_jwt_grant_type
     # .. custom_attribute_description: The grant type of the newly created JWT.
     set_custom_attribute('create_jwt_grant_type', grant_type)
+    scopes = _get_updated_scopes(token_dict['scope'].split(' '), grant_type)
 
     jwt_access_token = _create_jwt(
         access_token.user,
-        scopes=token_dict['scope'].split(' '),
+        scopes=scopes,
         expires_in=jwt_expires_in,
         use_asymmetric_key=use_asymmetric_key,
         is_restricted=oauth_adapter.is_client_restricted(client),
@@ -90,11 +93,16 @@ def create_jwt_token_dict(token_dict, oauth_adapter, use_asymmetric_key=None):
     )
 
     jwt_token_dict = token_dict.copy()
-    # Note: only "scope" is not overwritten at this point.
+    # Note: only "refresh_token" is not overwritten at this point.
+    # At this time, the user_id scope added for grant type password is only added to the
+    # JWT, and is not added for the DOT access token or refresh token, so we must override
+    # here. If this inconsistency becomes an issue, then the user_id scope should be
+    # added earlier with the DOT tokens, and we would no longer need to override "scope".
     jwt_token_dict.update({
         "access_token": jwt_access_token,
         "token_type": "JWT",
         "expires_in": jwt_expires_in,
+        "scope": ' '.join(scopes),
     })
     return jwt_token_dict
 
@@ -166,9 +174,7 @@ def _create_jwt(
     else:
         increment('create_symmetric_jwt_count')
 
-    # Default scopes should only contain non-privileged data.
-    # Do not be misled by the fact that `email` and `profile` are default scopes. They
-    # were included for legacy compatibility, even though they contain privileged data.
+    # Scopes `email` and `profile` are included for legacy compatibility.
     scopes = scopes or ['email', 'profile']
     iat, exp = _compute_time_fields(expires_in)
 
@@ -273,17 +279,28 @@ def _attach_profile_claim(payload, user):
 
 def _encode_and_sign(payload, use_asymmetric_key, secret):
     """Encode and sign the provided payload."""
-    keys = jwk.KEYS()
 
     if use_asymmetric_key:
-        serialized_keypair = json.loads(settings.JWT_AUTH['JWT_PRIVATE_SIGNING_JWK'])
-        keys.add(serialized_keypair)
+        key = json.loads(settings.JWT_AUTH['JWT_PRIVATE_SIGNING_JWK'])
         algorithm = settings.JWT_AUTH['JWT_SIGNING_ALGORITHM']
     else:
-        key = secret if secret else settings.JWT_AUTH['JWT_SECRET_KEY']
-        keys.add({'key': key, 'kty': 'oct'})
+        secret = secret if secret else settings.JWT_AUTH['JWT_SECRET_KEY']
+        key = {'k': base64url_encode(secret.encode('utf-8')), 'kty': 'oct'}
         algorithm = settings.JWT_AUTH['JWT_ALGORITHM']
 
-    data = json.dumps(payload)
-    jws = JWS(data, alg=algorithm)
-    return jws.sign_compact(keys=keys)
+    jwk = PyJWK(key, algorithm)
+    return jwt.encode(payload, jwk.key, algorithm=algorithm)
+
+
+def _get_updated_scopes(scopes, grant_type):
+    """
+    Default scopes should only contain non-privileged data.
+    Do not be misled by the fact that `email` and `profile` are default scopes.
+    They were included for legacy compatibility, even though they contain privileged
+    data. The scope `user_id` must be added for requests with grant_type password.
+    """
+    scopes = scopes or ['email', 'profile']
+
+    if grant_type == Application.GRANT_PASSWORD and 'user_id' not in scopes:
+        scopes.append('user_id')
+    return scopes
diff --git a/openedx/core/djangoapps/oauth_dispatch/management/commands/generate_jwt_signing_key.py b/openedx/core/djangoapps/oauth_dispatch/management/commands/generate_jwt_signing_key.py
index cca094bf8228..a139cebca161 100644
--- a/openedx/core/djangoapps/oauth_dispatch/management/commands/generate_jwt_signing_key.py
+++ b/openedx/core/djangoapps/oauth_dispatch/management/commands/generate_jwt_signing_key.py
@@ -14,7 +14,7 @@
 from Cryptodome.PublicKey import RSA
 from django.conf import settings
 from django.core.management.base import BaseCommand
-from jwkest import jwk
+from jwt.algorithms import get_default_algorithms
 
 log = logging.getLogger(__name__)
 
@@ -123,15 +123,23 @@ def _generate_key_id(self, size, chars=string.ascii_uppercase + string.digits):
     def _generate_key_pair(self, key_size, key_id):
         log.info('Generating new JWT signing keypair for key id %s.', key_id)
         rsa_key = RSA.generate(key_size)
-        rsa_jwk = jwk.RSAKey(kid=key_id, key=rsa_key)
-        return rsa_jwk
+        algo = get_default_algorithms()['RS512']
+        key_data = algo.prepare_key(rsa_key.export_key('PEM').decode())
+        rsa_jwk = json.loads(algo.to_jwk(key_data))
+        public_rsa_jwk = json.loads(algo.to_jwk(key_data.public_key()))
+
+        rsa_jwk['kid'] = key_id
+        public_rsa_jwk['kid'] = key_id
+        return {'private': rsa_jwk, 'public': public_rsa_jwk}
 
     def _output_public_keys(self, jwk_key, add_previous, strip_prefix):
-        public_keys = jwk.KEYS()
+        public_keys = {'keys': []}
+
         if add_previous:
             self._add_previous_public_keys(public_keys)
-        public_keys.append(jwk_key)
-        serialized_public_keys = public_keys.dump_jwks()
+
+        public_keys['keys'].append(jwk_key['public'])
+        serialized_public_keys = json.dumps(public_keys)
 
         prefix = '' if strip_prefix else 'COMMON_'
         public_signing_key = f'{prefix}JWT_PUBLIC_SIGNING_JWK_SET'
@@ -155,11 +163,10 @@ def _add_previous_public_keys(self, public_keys):
         previous_signing_keys = settings.JWT_AUTH.get('JWT_PUBLIC_SIGNING_JWK_SET')
         if previous_signing_keys:
             log.info('Old JWT_PUBLIC_SIGNING_JWK_SET: %s.', previous_signing_keys)
-            public_keys.load_jwks(previous_signing_keys)
+            public_keys['keys'].extend(json.loads(previous_signing_keys)['keys'])
 
     def _output_private_keys(self, jwk_key, strip_prefix):
-        serialized_keypair = jwk_key.serialize(private=True)
-        serialized_keypair_json = json.dumps(serialized_keypair)
+        serialized_keypair_json = json.dumps(jwk_key['private'])
 
         prefix = '' if strip_prefix else 'EDXAPP_'
         private_signing_key = f'{prefix}JWT_PRIVATE_SIGNING_JWK'
diff --git a/openedx/core/djangoapps/oauth_dispatch/tests/mixins.py b/openedx/core/djangoapps/oauth_dispatch/tests/mixins.py
index 6818c171c690..d99ac4883b18 100644
--- a/openedx/core/djangoapps/oauth_dispatch/tests/mixins.py
+++ b/openedx/core/djangoapps/oauth_dispatch/tests/mixins.py
@@ -3,10 +3,11 @@
 """
 
 import pytest
-import jwt
 from django.conf import settings
-from jwkest.jwk import KEYS
-from jwkest.jws import JWS
+from edx_rest_framework_extensions.auth.jwt.decoder import (
+    get_verification_jwk_key_set,
+    verify_jwk_signature_using_keyset
+)
 from jwt.exceptions import ExpiredSignatureError
 
 from common.djangoapps.student.models import UserProfile, anonymous_id_for_user
@@ -33,25 +34,15 @@ def _decode_jwt(verify_expiration):
             Helper method to decode a JWT with the ability to
             verify the expiration of said token
             """
-            keys = KEYS()
-            if should_be_asymmetric_key:
-                keys.load_jwks(settings.JWT_AUTH['JWT_PUBLIC_SIGNING_JWK_SET'])
-            else:
-                keys.add({'key': secret_key, 'kty': 'oct'})
-
-            _ = JWS().verify_compact(access_token.encode('utf-8'), keys)
-
-            return jwt.decode(
-                access_token,
-                secret_key,
-                algorithms=[settings.JWT_AUTH['JWT_ALGORITHM']],
-                audience=audience,
-                issuer=issuer,
-                options={
-                    'verify_signature': False,
-                    "verify_exp": verify_expiration
-                },
-            )
+            asymmetric_keys = settings.JWT_AUTH.get('JWT_PUBLIC_SIGNING_JWK_SET') if should_be_asymmetric_key else None
+            key_set = get_verification_jwk_key_set(asymmetric_keys=asymmetric_keys, secret_key=secret_key)
+            data = verify_jwk_signature_using_keyset(access_token,
+                                                     key_set,
+                                                     iss=issuer,
+                                                     aud=aud,
+                                                     verify_exp=verify_expiration)
+
+            return data
 
         # Note that if we expect the claims to have expired
         # then we ask the JWT library not to verify expiration
diff --git a/openedx/core/djangoapps/oauth_dispatch/tests/test_dot_overrides.py b/openedx/core/djangoapps/oauth_dispatch/tests/test_dot_overrides.py
index 37bc12ceaa27..dc38b18c6eef 100644
--- a/openedx/core/djangoapps/oauth_dispatch/tests/test_dot_overrides.py
+++ b/openedx/core/djangoapps/oauth_dispatch/tests/test_dot_overrides.py
@@ -31,19 +31,20 @@ class AuthenticateTestCase(TestCase):
 
     def setUp(self):
         super().setUp()
+        self.TEST_PASSWORD = 'Password1234'
         self.user = UserFactory.create(
             username='darkhelmet',
-            password='12345',
+            password=self.TEST_PASSWORD,
             email='darkhelmet@spaceball_one.org',
         )
         self.validator = EdxOAuth2Validator()
 
     def test_authenticate_with_username(self):
-        user = self.validator._authenticate(username='darkhelmet', password='12345')
+        user = self.validator._authenticate(username='darkhelmet', password=self.TEST_PASSWORD)
         assert self.user == user
 
     def test_authenticate_with_email(self):
-        user = self.validator._authenticate(username='darkhelmet@spaceball_one.org', password='12345')
+        user = self.validator._authenticate(username='darkhelmet@spaceball_one.org', password=self.TEST_PASSWORD)
         assert self.user == user
 
 
@@ -56,9 +57,10 @@ class CustomValidationTestCase(TestCase):
     """
     def setUp(self):
         super().setUp()
+        self.TEST_PASSWORD = 'Password1234'
         self.user = UserFactory.create(
             username='darkhelmet',
-            password='12345',
+            password=self.TEST_PASSWORD,
             email='darkhelmet@spaceball_one.org',
         )
         self.validator = EdxOAuth2Validator()
@@ -67,13 +69,13 @@ def setUp(self):
     def test_active_user_validates(self):
         assert self.user.is_active
         request = self.request_factory.get('/')
-        assert self.validator.validate_user('darkhelmet', '12345', client=None, request=request)
+        assert self.validator.validate_user('darkhelmet', self.TEST_PASSWORD, client=None, request=request)
 
     def test_inactive_user_validates(self):
         self.user.is_active = False
         self.user.save()
         request = self.request_factory.get('/')
-        assert self.validator.validate_user('darkhelmet', '12345', client=None, request=request)
+        assert self.validator.validate_user('darkhelmet', self.TEST_PASSWORD, client=None, request=request)
 
 
 @skip_unless_lms
@@ -87,9 +89,10 @@ class CustomAuthorizationViewTestCase(TestCase):
     """
     def setUp(self):
         super().setUp()
+        self.TEST_PASSWORD = 'Password1234'
         self.dot_adapter = adapters.DOTAdapter()
-        self.user = UserFactory()
-        self.client.login(username=self.user.username, password='test')
+        self.user = UserFactory(password=self.TEST_PASSWORD)
+        self.client.login(username=self.user.username, password=self.TEST_PASSWORD)
 
         self.restricted_dot_app = self._create_restricted_app()
         self._create_expired_token(self.restricted_dot_app)
diff --git a/openedx/core/djangoapps/oauth_dispatch/tests/test_jwt.py b/openedx/core/djangoapps/oauth_dispatch/tests/test_jwt.py
index abacfe6bee8a..7851158614f6 100644
--- a/openedx/core/djangoapps/oauth_dispatch/tests/test_jwt.py
+++ b/openedx/core/djangoapps/oauth_dispatch/tests/test_jwt.py
@@ -21,6 +21,7 @@ def setUp(self):
         super().setUp()
         self.user = UserFactory()
         self.default_scopes = ['email', 'profile']
+        self.default_scopes_password_grant_type = ['email', 'profile', 'user_id']
 
     def _create_client(self, oauth_adapter, client_restricted, grant_type=None):
         """
@@ -176,7 +177,7 @@ def test_password_grant_type(self):
         jwt_token_dict = jwt_api.create_jwt_token_dict(token_dict, oauth_adapter, use_asymmetric_key=False)
 
         self.assert_valid_jwt_access_token(
-            jwt_token_dict["access_token"], self.user, self.default_scopes,
+            jwt_token_dict["access_token"], self.user, self.default_scopes_password_grant_type,
             grant_type='password',
         )
 
diff --git a/openedx/core/djangoapps/oauth_dispatch/tests/test_views.py b/openedx/core/djangoapps/oauth_dispatch/tests/test_views.py
index d6ed9ca30cbf..ef03dab0ac8a 100644
--- a/openedx/core/djangoapps/oauth_dispatch/tests/test_views.py
+++ b/openedx/core/djangoapps/oauth_dispatch/tests/test_views.py
@@ -9,12 +9,10 @@
 
 import ddt
 import httpretty
-from Cryptodome.PublicKey import RSA
 from django.conf import settings
 from django.test import RequestFactory, TestCase
 from django.urls import reverse
 from edx_toggles.toggles.testutils import override_waffle_switch
-from jwkest import jwk
 from oauth2_provider import models as dot_models
 
 from common.djangoapps.student.tests.factories import UserFactory
@@ -86,8 +84,9 @@ class _DispatchingViewTestCase(TestCase):
     """
     def setUp(self):
         super().setUp()
+        self.TEST_PASSWORD = 'Password1234'
         self.dot_adapter = adapters.DOTAdapter()
-        self.user = UserFactory()
+        self.user = UserFactory(password=self.TEST_PASSWORD)
         self.dot_app = self.dot_adapter.create_public_client(
             name='test dot application',
             user=self.user,
@@ -148,7 +147,7 @@ def _post_body(self, user, client, token_type=None, scope=None, asymmetric_jwt=N
 
         if grant_type == dot_models.Application.GRANT_PASSWORD:
             body['username'] = user.username
-            body['password'] = 'test'
+            body['password'] = self.TEST_PASSWORD
         elif grant_type == dot_models.Application.GRANT_CLIENT_CREDENTIALS:
             body['client_secret'] = client.client_secret
 
@@ -163,20 +162,6 @@ def _post_body(self, user, client, token_type=None, scope=None, asymmetric_jwt=N
 
         return body
 
-    def _generate_key_pair(self):
-        """ Generates an asymmetric key pair and returns the JWK of its public keys and keypair. """
-        rsa_key = RSA.generate(2048)
-        rsa_jwk = jwk.RSAKey(kid="key_id", key=rsa_key)
-
-        public_keys = jwk.KEYS()
-        public_keys.append(rsa_jwk)
-        serialized_public_keys_json = public_keys.dump_jwks()
-
-        serialized_keypair = rsa_jwk.serialize(private=True)
-        serialized_keypair_json = json.dumps(serialized_keypair)
-
-        return serialized_public_keys_json, serialized_keypair_json
-
     def _test_jwt_access_token(self, client_attr, token_type=None, headers=None, grant_type=None, asymmetric_jwt=False):
         """
         Test response for JWT token.
@@ -330,17 +315,21 @@ def test_jwt_access_token_scopes_and_filters(self, grant_type):
             scopes=['grades:read'],
             filters=['test:filter'],
         )
-        scopes = dot_app_access.scopes
+        requested_scopes = dot_app_access.scopes
         filters = self.dot_adapter.get_authorization_filters(dot_app)
         assert 'test:filter' in filters
 
-        response = self._post_request(self.user, dot_app, token_type='jwt', scope=scopes)
+        response = self._post_request(self.user, dot_app, token_type='jwt', scope=requested_scopes)
         assert response.status_code == 200
         data = json.loads(response.content.decode('utf-8'))
+        scopes_in_response = data['scope'].split(' ')
+        for requested_scope in requested_scopes:
+            assert requested_scope in scopes_in_response
+
         self.assert_valid_jwt_access_token(
             data['access_token'],
             self.user,
-            scopes,
+            scopes_in_response,
             filters=filters,
             grant_type=grant_type,
         )
@@ -598,7 +587,7 @@ def setUp(self):
     @ddt.unpack
     def test_post_authorization_view(self, client_type, allow_field):
         oauth_application = getattr(self, f'{client_type}_app')
-        self.client.login(username=self.user.username, password='test')
+        self.client.login(username=self.user.username, password=self.TEST_PASSWORD)
         response = self.client.post(
             '/oauth2/authorize/',
             {
@@ -620,7 +609,7 @@ def test_check_dot_authorization_page_get(self):
         Make sure we get the overridden Authorization page - not
         the default django-oauth-toolkit when we perform a page load
         """
-        self.client.login(username=self.user.username, password='test')
+        self.client.login(username=self.user.username, password=self.TEST_PASSWORD)
         response = self.client.get(
             '/oauth2/authorize/',
             {
@@ -787,7 +776,7 @@ def access_token_post_body_with_password(self):
             'client_id': self.dot_app.client_id,
             'grant_type': 'password',
             'username': self.user.username,
-            'password': 'test',
+            'password': self.TEST_PASSWORD,
         }
 
     def access_token_post_body_with_refresh_token(self, refresh_token):
diff --git a/openedx/core/djangoapps/safe_sessions/tests/test_middleware.py b/openedx/core/djangoapps/safe_sessions/tests/test_middleware.py
index a13161b78890..079cdcdd0c71 100644
--- a/openedx/core/djangoapps/safe_sessions/tests/test_middleware.py
+++ b/openedx/core/djangoapps/safe_sessions/tests/test_middleware.py
@@ -36,6 +36,7 @@ def setUp(self):
         self.user = UserFactory.create()
         self.addCleanup(set_current_request, None)
         self.request = get_mock_request()
+        self.TEST_PASSWORD = 'Password1234'
 
     def assert_response(self, safe_cookie_data=None, success=True):
         """
@@ -79,7 +80,7 @@ def assert_user_in_session(self):
     @patch("openedx.core.djangoapps.safe_sessions.middleware.LOG_REQUEST_USER_CHANGES", False)
     @patch("openedx.core.djangoapps.safe_sessions.middleware.track_request_user_changes")
     def test_success(self, mock_log_request_user_changes):
-        self.client.login(username=self.user.username, password='test')
+        self.client.login(username=self.user.username, password=self.TEST_PASSWORD)
         session_id = self.client.session.session_key
         safe_cookie_data = SafeCookieData.create(session_id, self.user.id)
 
@@ -106,7 +107,7 @@ def test_success(self, mock_log_request_user_changes):
     @patch("openedx.core.djangoapps.safe_sessions.middleware.LOG_REQUEST_USER_CHANGES", True)
     @patch("openedx.core.djangoapps.safe_sessions.middleware.track_request_user_changes")
     def test_log_request_user_on(self, mock_log_request_user_changes):
-        self.client.login(username=self.user.username, password='test')
+        self.client.login(username=self.user.username, password=self.TEST_PASSWORD)
         session_id = self.client.session.session_key
         safe_cookie_data = SafeCookieData.create(session_id, self.user.id)
 
@@ -134,7 +135,7 @@ def test_parse_error_at_step_1(self):
         self.assert_no_session()
 
     def test_invalid_user_at_step_4(self):
-        self.client.login(username=self.user.username, password='test')
+        self.client.login(username=self.user.username, password=self.TEST_PASSWORD)
         safe_cookie_data = SafeCookieData.create(self.client.session.session_key, 'no_such_user')
         self.request.META['HTTP_ACCEPT'] = 'text/html'
         with self.assert_incorrect_user_logged():
@@ -260,7 +261,8 @@ class TestSafeSessionMiddleware(TestSafeSessionsLogMixin, CacheIsolationTestCase
 
     def setUp(self):
         super().setUp()
-        self.user = UserFactory.create()
+        self.TEST_PASSWORD = 'Password1234'
+        self.user = UserFactory.create(password=self.TEST_PASSWORD)
         self.addCleanup(set_current_request, None)
         self.request = get_mock_request()
         self.client.response = HttpResponse()
@@ -280,7 +282,7 @@ def set_up_for_success(self):
         """
         Set up request for success path -- everything up until process_response().
         """
-        self.client.login(username=self.user.username, password='test')
+        self.client.login(username=self.user.username, password=self.TEST_PASSWORD)
 
         session_id = self.client.session.session_key
         safe_cookie_data = SafeCookieData.create(session_id, self.user.id)
diff --git a/openedx/core/djangoapps/signals/signals.py b/openedx/core/djangoapps/signals/signals.py
index d11caaa24d15..ca693b4d109b 100644
--- a/openedx/core/djangoapps/signals/signals.py
+++ b/openedx/core/djangoapps/signals/signals.py
@@ -11,7 +11,7 @@
 
 # Signal that fires when a user is awarded a certificate in a course (in the certificates django app)
 # TODO: runtime coupling between apps will be reduced if this event is changed to carry a username
-# rather than a User object; however, this will require changes to the milestones and badges APIs
+# rather than a User object; however, this will require changes to the milestones
 # Same providing_args=["user", "course_key", "mode", "status"] for next 3 signals.
 COURSE_CERT_CHANGED = Signal()
 COURSE_CERT_AWARDED = Signal()
diff --git a/openedx/core/djangoapps/theming/tests/test_theme_style_overrides.py b/openedx/core/djangoapps/theming/tests/test_theme_style_overrides.py
index 21b9ba952a3e..d7578f25eb87 100644
--- a/openedx/core/djangoapps/theming/tests/test_theme_style_overrides.py
+++ b/openedx/core/djangoapps/theming/tests/test_theme_style_overrides.py
@@ -24,14 +24,15 @@ def setUp(self):
         Clear static file finders cache and register cleanup methods.
         """
         super().setUp()
-        self.user = UserFactory()
+        self.TEST_PASSWORD = 'Password1234'
+        self.user = UserFactory(password=self.TEST_PASSWORD)
 
         # Clear the internal staticfiles caches, to get test isolation.
         staticfiles.finders.get_finder.cache_clear()
 
     def _login(self):
         """ Log into LMS. """
-        self.client.login(username=self.user.username, password='test')
+        self.client.login(username=self.user.username, password=self.TEST_PASSWORD)
 
     @with_comprehensive_theme("test-theme")
     def test_footer(self):
diff --git a/openedx/core/djangoapps/theming/tests/test_views.py b/openedx/core/djangoapps/theming/tests/test_views.py
index 3eefd7bed890..5b5503702cd8 100644
--- a/openedx/core/djangoapps/theming/tests/test_views.py
+++ b/openedx/core/djangoapps/theming/tests/test_views.py
@@ -13,7 +13,7 @@
 
 THEMING_ADMIN_URL = '/theming/admin'
 TEST_THEME_NAME = 'test-theme'
-TEST_PASSWORD = 'test'
+TEST_PASSWORD = 'Password1234'
 
 
 class TestThemingViews(TestCase):
diff --git a/openedx/core/djangoapps/user_api/accounts/serializers.py b/openedx/core/djangoapps/user_api/accounts/serializers.py
index 75ecfa35bf2b..b17f479b452d 100644
--- a/openedx/core/djangoapps/user_api/accounts/serializers.py
+++ b/openedx/core/djangoapps/user_api/accounts/serializers.py
@@ -21,7 +21,6 @@
     UserPasswordToggleHistory,
     UserProfile
 )
-from lms.djangoapps.badges.utils import badges_enabled
 from openedx.core.djangoapps.site_configuration import helpers as configuration_helpers
 from openedx.core.djangoapps.user_api import errors
 from openedx.core.djangoapps.user_api.accounts.utils import is_secondary_email_feature_enabled
@@ -136,7 +135,6 @@ def to_representation(self, user):  # lint-amnesty, pylint: disable=arguments-di
         except ObjectDoesNotExist:
             activation_key = None
 
-        accomplishments_shared = badges_enabled()
         data = {
             "username": user.username,
             "url": self.context.get('request').build_absolute_uri(
@@ -164,7 +162,6 @@ def to_representation(self, user):  # lint-amnesty, pylint: disable=arguments-di
             "level_of_education": None,
             "mailing_address": None,
             "requires_parental_consent": None,
-            "accomplishments_shared": accomplishments_shared,
             "account_privacy": self.configuration.get('default_visibility'),
             "social_links": None,
             "extended_profile_fields": None,
diff --git a/openedx/core/djangoapps/user_api/accounts/tests/test_api.py b/openedx/core/djangoapps/user_api/accounts/tests/test_api.py
index fb4686d13934..569ec984662b 100644
--- a/openedx/core/djangoapps/user_api/accounts/tests/test_api.py
+++ b/openedx/core/djangoapps/user_api/accounts/tests/test_api.py
@@ -88,7 +88,7 @@ class TestAccountApi(UserSettingsEventTestMixin, EmailTemplateTagMixin, CreateAc
     This includes the specific types of error raised, and default behavior when optional arguments
     are not specified.
     """
-    password = "test"
+    password = 'Password1234'
 
     def setUp(self):
         super().setUp()
@@ -625,7 +625,6 @@ def test_create_account(self):
             'requires_parental_consent': True,
             'language_proficiencies': [],
             'account_privacy': PRIVATE_VISIBILITY,
-            'accomplishments_shared': False,
             'extended_profile': [],
             'secondary_email': None,
             'secondary_email_enabled': None,
diff --git a/openedx/core/djangoapps/user_api/accounts/tests/test_retirement_views.py b/openedx/core/djangoapps/user_api/accounts/tests/test_retirement_views.py
index 6ec6e3694fed..0cc2754e4760 100644
--- a/openedx/core/djangoapps/user_api/accounts/tests/test_retirement_views.py
+++ b/openedx/core/djangoapps/user_api/accounts/tests/test_retirement_views.py
@@ -39,7 +39,7 @@
     CreditRequirement,
     CreditRequirementStatus
 )
-from openedx.core.djangoapps.external_user_ids.models import ExternalId, ExternalIdType
+from openedx.core.djangoapps.external_user_ids.models import ExternalIdType
 from openedx.core.djangoapps.oauth_dispatch.jwt import create_jwt_for_user
 from openedx.core.djangoapps.site_configuration.tests.factories import SiteFactory
 from openedx.core.djangoapps.user_api.accounts.views import AccountRetirementPartnerReportView
@@ -496,7 +496,6 @@ class TestPartnerReportingList(ModuleStoreTestCase):
     """
     EXPECTED_MB_ORGS_CONFIG = [
         {
-            AccountRetirementPartnerReportView.ORGS_CONFIG_ORG_KEY: 'mb_coaching',
             AccountRetirementPartnerReportView.ORGS_CONFIG_FIELD_HEADINGS_KEY: [
                 AccountRetirementPartnerReportView.STUDENT_ID_KEY,
                 AccountRetirementPartnerReportView.ORIGINAL_EMAIL_KEY,
@@ -516,7 +515,7 @@ def setUp(self):
         self.url = reverse('accounts_retirement_partner_report')
         self.maxDiff = None
         self.test_created_datetime = datetime.datetime(2018, 1, 1, tzinfo=pytz.UTC)
-        ExternalIdType.objects.get_or_create(name=ExternalIdType.MICROBACHELORS_COACHING)
+        ExternalIdType.objects.get_or_create(name=ExternalIdType.CALIPER)
 
     def get_user_dict(self, user, enrollments):
         """
@@ -624,56 +623,6 @@ def test_success_multiple_statuses(self):
 
         self.assert_status_and_user_list(user_dicts)
 
-    def test_success_mb_coaching(self):
-        """
-        Check that MicroBachelors users who have consented to coaching have the proper info
-        included for the partner report.
-        """
-        path = 'openedx.core.djangoapps.user_api.accounts.views.has_ever_consented_to_coaching'
-        with mock.patch(path, return_value=True) as mock_has_ever_consented:
-            user_dicts, users = self.create_partner_reporting_statuses(num=1)
-            external_id, created = ExternalId.add_new_user_id(  # lint-amnesty, pylint: disable=unused-variable
-                user=users[0],
-                type_name=ExternalIdType.MICROBACHELORS_COACHING
-            )
-
-            expected_user = user_dicts[0]
-            expected_users = [expected_user]
-            expected_user[AccountRetirementPartnerReportView.STUDENT_ID_KEY] = str(external_id.external_user_id)
-            expected_user[
-                AccountRetirementPartnerReportView.ORGS_CONFIG_KEY] = TestPartnerReportingList.EXPECTED_MB_ORGS_CONFIG
-
-            self.assert_status_and_user_list(expected_users)
-            mock_has_ever_consented.assert_called_once()
-
-    def test_success_mb_coaching_no_external_id(self):
-        """
-        Check that MicroBachelors users who have consented to coaching, but who do not have an external id, have the
-        proper info included for the partner report.
-        """
-        path = 'openedx.core.djangoapps.user_api.accounts.views.has_ever_consented_to_coaching'
-        with mock.patch(path, return_value=True) as mock_has_ever_consented:
-            user_dicts, users = self.create_partner_reporting_statuses(num=1)  # lint-amnesty, pylint: disable=unused-variable
-
-            self.assert_status_and_user_list(user_dicts)
-            mock_has_ever_consented.assert_called_once()
-
-    def test_success_mb_coaching_no_consent(self):
-        """
-        Check that MicroBachelors users who have not consented to coaching have the proper info
-        included for the partner report.
-        """
-        path = 'openedx.core.djangoapps.user_api.accounts.views.has_ever_consented_to_coaching'
-        with mock.patch(path, return_value=False) as mock_has_ever_consented:
-            user_dicts, users = self.create_partner_reporting_statuses(num=1)
-            ExternalId.add_new_user_id(
-                user=users[0],
-                type_name=ExternalIdType.MICROBACHELORS_COACHING
-            )
-
-            self.assert_status_and_user_list(user_dicts)
-            mock_has_ever_consented.assert_called_once()
-
     def test_no_users(self):
         """
         Checks that the call returns a success code and empty list if no users are found.
diff --git a/openedx/core/djangoapps/user_api/accounts/tests/test_views.py b/openedx/core/djangoapps/user_api/accounts/tests/test_views.py
index 63cb59cace5f..546b8afacc2b 100644
--- a/openedx/core/djangoapps/user_api/accounts/tests/test_views.py
+++ b/openedx/core/djangoapps/user_api/accounts/tests/test_views.py
@@ -359,7 +359,7 @@ class TestAccountsAPI(FilteredQueryCountMixin, CacheIsolationTestCase, UserAPITe
 
     ENABLED_CACHES = ['default']
     TOTAL_QUERY_COUNT = 24
-    FULL_RESPONSE_FIELD_COUNT = 30
+    FULL_RESPONSE_FIELD_COUNT = 29
 
     def setUp(self):
         super().setUp()
@@ -379,12 +379,12 @@ def _set_user_age_to_10_years(self, user):
         legacy_profile.save()
         return year_of_birth
 
-    def _verify_full_shareable_account_response(self, response, account_privacy=None, badges_enabled=False):
+    def _verify_full_shareable_account_response(self, response, account_privacy=None):
         """
         Verify that the shareable fields from the account are returned
         """
         data = response.data
-        assert 12 == len(data)
+        assert 11 == len(data)
 
         # public fields (3)
         assert account_privacy == data['account_privacy']
@@ -399,7 +399,6 @@ def _verify_full_shareable_account_response(self, response, account_privacy=None
         assert 'm' == data['level_of_education']
         assert data['social_links'] is not None
         assert data['time_zone'] is None
-        assert badges_enabled == data['accomplishments_shared']
 
     def _verify_private_account_response(self, response, requires_parental_consent=False):
         """
@@ -436,7 +435,6 @@ def _verify_full_account_response(self, response, requires_parental_consent=Fals
         assert 'm' == data['level_of_education']
         assert data['social_links'] is not None
         assert UserPreference.get_value(self.user, 'time_zone') == data['time_zone']
-        assert data['accomplishments_shared'] is not None
         assert ((self.user.first_name + ' ') + self.user.last_name) == data['name']
 
         # additional admin fields (13)
@@ -669,7 +667,6 @@ def test_get_account_different_user_private(self):
             response = self.send_get(self.different_client)
         self._verify_private_account_response(response)
 
-    @mock.patch.dict(settings.FEATURES, {'ENABLE_OPENBADGES': True})
     @ddt.data(
         ("client", "user", PRIVATE_VISIBILITY),
         ("different_client", "different_user", PRIVATE_VISIBILITY),
@@ -691,7 +688,7 @@ def verify_fields_visible_to_all_users(response):
             if preference_visibility == PRIVATE_VISIBILITY:
                 self._verify_private_account_response(response)
             else:
-                self._verify_full_shareable_account_response(response, ALL_USERS_VISIBILITY, badges_enabled=True)
+                self._verify_full_shareable_account_response(response, ALL_USERS_VISIBILITY)
 
         client = self.login_client(api_client, requesting_username)
 
@@ -812,8 +809,6 @@ def verify_get_own_information(queries):
             assert [] == data['language_proficiencies']
             assert PRIVATE_VISIBILITY == data['account_privacy']
             assert data['time_zone'] is None
-            # Badges aren't on by default, so should not be present.
-            assert data['accomplishments_shared'] is False
 
         self.client.login(username=self.user.username, password=TEST_PASSWORD)
         verify_get_own_information(self._get_num_queries(22))
diff --git a/openedx/core/djangoapps/user_api/accounts/views.py b/openedx/core/djangoapps/user_api/accounts/views.py
index 83bdde4f442d..6eb2e8341ecd 100644
--- a/openedx/core/djangoapps/user_api/accounts/views.py
+++ b/openedx/core/djangoapps/user_api/accounts/views.py
@@ -57,7 +57,6 @@
 from openedx.core.djangoapps.api_admin.models import ApiAccessRequest
 from openedx.core.djangoapps.course_groups.models import UnregisteredLearnerCohortAssignments
 from openedx.core.djangoapps.credit.models import CreditRequest, CreditRequirementStatus
-from openedx.core.djangoapps.external_user_ids.models import ExternalId, ExternalIdType
 from openedx.core.djangoapps.lang_pref import LANGUAGE_KEY
 from openedx.core.djangoapps.profile_images.images import remove_profile_images
 from openedx.core.djangoapps.user_api import accounts
@@ -93,11 +92,6 @@
 from .signals import USER_RETIRE_LMS_CRITICAL, USER_RETIRE_LMS_MISC, USER_RETIRE_MAILINGS
 from .utils import create_retirement_request_and_deactivate_account, username_suffix_generator
 
-try:
-    from coaching.api import has_ever_consented_to_coaching
-except ImportError:
-    has_ever_consented_to_coaching = None
-
 log = logging.getLogger(__name__)
 
 USER_PROFILE_PII = {
@@ -250,9 +244,6 @@ class AccountViewSet(ViewSet):
               If "custom", the user has selectively chosen a subset of shareable
               fields to make visible to others via the User Preferences API.
 
-            * accomplishments_shared: Signals whether badges are enabled on the
-              platform and should be fetched.
-
             * phone_number: The phone number for the user. String of numbers with
               an optional `+` sign at the start.
 
@@ -746,49 +737,8 @@ def _get_retirement_for_partner_report(self, retirement_status):
             'created': retirement_status.created,
         }
 
-        # Some orgs have a custom list of headings and content for the partner report. Add this, if applicable.
-        self._add_orgs_config_for_user(retirement, retirement_status.user)
-
         return retirement
 
-    def _add_orgs_config_for_user(self, retirement, user):
-        """
-        Check to see if the user's info was sent to any partners (orgs) that have a a custom list of headings and
-        content for the partner report. If so, add this.
-        """
-        # See if the MicroBachelors coaching provider needs to be notified of this user's retirement
-        if has_ever_consented_to_coaching is not None and has_ever_consented_to_coaching(user):
-            # See if the user has a MicroBachelors external id. If not, they were never sent to the
-            # coaching provider.
-            external_ids = ExternalId.objects.filter(
-                user=user,
-                external_id_type__name=ExternalIdType.MICROBACHELORS_COACHING
-            )
-            if external_ids.exists():
-                # User has an external id. Add the additional info.
-                external_id = str(external_ids[0].external_user_id)
-                self._add_coaching_orgs_config(retirement, external_id)
-
-    def _add_coaching_orgs_config(self, retirement, external_id):
-        """
-        Add the orgs configuration for MicroBachelors coaching
-        """
-        # Add the custom field headings
-        retirement[AccountRetirementPartnerReportView.ORGS_CONFIG_KEY] = [
-            {
-                AccountRetirementPartnerReportView.ORGS_CONFIG_ORG_KEY: 'mb_coaching',
-                AccountRetirementPartnerReportView.ORGS_CONFIG_FIELD_HEADINGS_KEY: [
-                    AccountRetirementPartnerReportView.STUDENT_ID_KEY,
-                    AccountRetirementPartnerReportView.ORIGINAL_EMAIL_KEY,
-                    AccountRetirementPartnerReportView.ORIGINAL_NAME_KEY,
-                    AccountRetirementPartnerReportView.DELETION_COMPLETED_KEY
-                ]
-            }
-        ]
-
-        # Add the custom field value
-        retirement[AccountRetirementPartnerReportView.STUDENT_ID_KEY] = external_id
-
     @request_requires_username
     def retirement_partner_status_create(self, request):
         """
diff --git a/openedx/core/djangoapps/user_api/tests/test_views.py b/openedx/core/djangoapps/user_api/tests/test_views.py
index aaf2daf96f76..fe577d7b8539 100644
--- a/openedx/core/djangoapps/user_api/tests/test_views.py
+++ b/openedx/core/djangoapps/user_api/tests/test_views.py
@@ -33,6 +33,7 @@ class UserAPITestCase(ApiTestCase):
     Parent test case for User API workflow coverage
     """
     LIST_URI = USER_LIST_URI
+    TEST_PASSWORD = 'Password1234'
 
     def get_uri_for_user(self, target_user):
         """Given a user object, get the URI for the corresponding resource"""
@@ -149,12 +150,12 @@ def test_delete_list_not_allowed(self):
         self.assertHttpMethodNotAllowed(self.request_with_auth("delete", self.LIST_URI))
 
     def test_list_unauthorized(self):
-        self.assertHttpForbidden(self.client.get(self.LIST_URI))
+        self.assertHttpNotAuthorized(self.client.get(self.LIST_URI))
 
     @override_settings(DEBUG=True)
     @override_settings(EDX_API_KEY=None)
     def test_debug_auth(self):
-        self.assertHttpForbidden(self.client.get(self.LIST_URI))
+        self.assertHttpNotAuthorized(self.client.get(self.LIST_URI))
 
     @override_settings(DEBUG=False)
     @override_settings(EDX_API_KEY=TEST_API_KEY)
@@ -163,7 +164,7 @@ def test_basic_auth(self):
         self.assertHttpOK(
             self.request_with_auth("get", self.LIST_URI,
                                    **self.basic_auth("someuser", "somepass")))
-        self.assertHttpForbidden(
+        self.assertHttpNotAuthorized(
             self.client.get(self.LIST_URI, **self.basic_auth("someuser", "somepass")))
 
     def test_get_list_nonempty(self):
@@ -235,12 +236,12 @@ def test_delete_list_not_allowed(self):
         self.assertHttpMethodNotAllowed(self.request_with_auth("delete", self.LIST_URI))
 
     def test_list_unauthorized(self):
-        self.assertHttpForbidden(self.client.get(self.LIST_URI))
+        self.assertHttpNotAuthorized(self.client.get(self.LIST_URI))
 
     @override_settings(DEBUG=True)
     @override_settings(EDX_API_KEY=None)
     def test_debug_auth(self):
-        self.assertHttpForbidden(self.client.get(self.LIST_URI))
+        self.assertHttpNotAuthorized(self.client.get(self.LIST_URI))
 
     @override_settings(DEBUG=False)
     @override_settings(EDX_API_KEY=TEST_API_KEY)
@@ -249,7 +250,7 @@ def test_basic_auth(self):
         self.assertHttpOK(
             self.request_with_auth("get", self.LIST_URI,
                                    **self.basic_auth('someuser', 'somepass')))
-        self.assertHttpForbidden(
+        self.assertHttpNotAuthorized(
             self.client.get(self.LIST_URI, **self.basic_auth('someuser', 'somepass')))
 
     def test_get_list_nonempty(self):
@@ -302,7 +303,7 @@ def test_delete_detail_not_allowed(self):
         self.assertHttpMethodNotAllowed(self.request_with_auth("delete", self.detail_uri))
 
     def test_get_detail_unauthorized(self):
-        self.assertHttpForbidden(self.client.get(self.detail_uri))
+        self.assertHttpNotAuthorized(self.client.get(self.detail_uri))
 
     def test_get_detail(self):
         user = self.users[1]
@@ -341,12 +342,12 @@ def test_delete_list_not_allowed(self):
         self.assertHttpMethodNotAllowed(self.request_with_auth("delete", self.LIST_URI))
 
     def test_list_unauthorized(self):
-        self.assertHttpForbidden(self.client.get(self.LIST_URI))
+        self.assertHttpNotAuthorized(self.client.get(self.LIST_URI))
 
     @override_settings(DEBUG=True)
     @override_settings(EDX_API_KEY=None)
     def test_debug_auth(self):
-        self.assertHttpForbidden(self.client.get(self.LIST_URI))
+        self.assertHttpNotAuthorized(self.client.get(self.LIST_URI))
 
     def test_get_list_nonempty(self):
         result = self.get_json(self.LIST_URI)
@@ -432,7 +433,7 @@ def test_delete_detail_not_allowed(self):
         self.assertHttpMethodNotAllowed(self.request_with_auth("delete", self.detail_uri))
 
     def test_detail_unauthorized(self):
-        self.assertHttpForbidden(self.client.get(self.detail_uri))
+        self.assertHttpNotAuthorized(self.client.get(self.detail_uri))
 
     def test_get_detail(self):
         pref = self.prefs[1]
@@ -465,12 +466,12 @@ def test_delete_not_allowed(self):
         self.assertHttpMethodNotAllowed(self.request_with_auth("delete", self.LIST_URI))
 
     def test_unauthorized(self):
-        self.assertHttpForbidden(self.client.get(self.LIST_URI))
+        self.assertHttpNotAuthorized(self.client.get(self.LIST_URI))
 
     @override_settings(DEBUG=True)
     @override_settings(EDX_API_KEY=None)
     def test_debug_auth(self):
-        self.assertHttpForbidden(self.client.get(self.LIST_URI))
+        self.assertHttpNotAuthorized(self.client.get(self.LIST_URI))
 
     def test_get_basic(self):
         result = self.get_json(self.LIST_URI)
@@ -582,8 +583,8 @@ def test_update_email_opt_in_inactive_user(self):
 
     def test_update_email_opt_in_anonymous_user(self):
         """
-        Test that an anonymous user gets 403 response when
-        updating email optin preference.
+        Test that an anonymous user gets 401 response when
+        updating email opt-in preference.
         """
         self.client.logout()
         response = self.client.post(self.url, {
diff --git a/openedx/core/djangoapps/user_api/verification_api/tests/test_views.py b/openedx/core/djangoapps/user_api/verification_api/tests/test_views.py
index 1a5d4fe46bdc..c585936e21ad 100644
--- a/openedx/core/djangoapps/user_api/verification_api/tests/test_views.py
+++ b/openedx/core/djangoapps/user_api/verification_api/tests/test_views.py
@@ -23,7 +23,7 @@ class VerificationViewTestsMixinBase:
     """ Base class for the tests on verification views """
     VIEW_NAME = None
     CREATED_AT = datetime.datetime.strptime(FROZEN_TIME, '%Y-%m-%d')
-    PASSWORD = 'test'
+    PASSWORD = 'Password1234'
 
     def setUp(self):
         freezer = freezegun.freeze_time(FROZEN_TIME)
diff --git a/openedx/core/djangoapps/user_api/views.py b/openedx/core/djangoapps/user_api/views.py
index 421a23adf6ff..b4fcc68db649 100644
--- a/openedx/core/djangoapps/user_api/views.py
+++ b/openedx/core/djangoapps/user_api/views.py
@@ -10,7 +10,7 @@
 from opaque_keys import InvalidKeyError
 from opaque_keys.edx import locator
 from opaque_keys.edx.keys import CourseKey
-from rest_framework import authentication, generics, status, viewsets
+from rest_framework import generics, status, viewsets
 from rest_framework.exceptions import ParseError
 from rest_framework.permissions import IsAuthenticated
 from rest_framework.views import APIView
@@ -31,7 +31,6 @@ class UserViewSet(viewsets.ReadOnlyModelViewSet):
     """
     DRF class for interacting with the User ORM object
     """
-    authentication_classes = (authentication.SessionAuthentication,)
     permission_classes = (ApiKeyHeaderPermission,)
     queryset = User.objects.all().prefetch_related("preferences").select_related("profile")
     serializer_class = UserSerializer
@@ -43,7 +42,6 @@ class ForumRoleUsersListView(generics.ListAPIView):
     """
     Forum roles are represented by a list of user dicts
     """
-    authentication_classes = (authentication.SessionAuthentication,)
     permission_classes = (ApiKeyHeaderPermission,)
     serializer_class = UserSerializer
     paginate_by = 10
@@ -67,7 +65,6 @@ class UserPreferenceViewSet(viewsets.ReadOnlyModelViewSet):
     """
     DRF class for interacting with the UserPreference ORM
     """
-    authentication_classes = (authentication.SessionAuthentication,)
     permission_classes = (ApiKeyHeaderPermission,)
     queryset = UserPreference.objects.all()
     filter_backends = (DjangoFilterBackend,)
@@ -81,7 +78,6 @@ class PreferenceUsersListView(generics.ListAPIView):
     """
     DRF class for listing a user's preferences
     """
-    authentication_classes = (authentication.SessionAuthentication,)
     permission_classes = (ApiKeyHeaderPermission,)
     serializer_class = UserSerializer
     paginate_by = 10
diff --git a/openedx/core/djangoapps/user_authn/api/tests/test_views.py b/openedx/core/djangoapps/user_authn/api/tests/test_views.py
index 034350a4c96f..d6720c46fc58 100644
--- a/openedx/core/djangoapps/user_authn/api/tests/test_views.py
+++ b/openedx/core/djangoapps/user_authn/api/tests/test_views.py
@@ -421,9 +421,9 @@ def setUp(self):
         Create a user, then log in.
         """
         super().setUp()
-        self.user = UserFactory()
+        self.user = UserFactory(password=self.TEST_PASSWORD)
         Registration().register(self.user)
-        result = self.client.login(username=self.user.username, password="test")
+        result = self.client.login(username=self.user.username, password=self.TEST_PASSWORD)
         assert result, 'Could not log in'
         self.path = reverse('send_account_activation_email')
 
diff --git a/openedx/core/djangoapps/user_authn/tests/utils.py b/openedx/core/djangoapps/user_authn/tests/utils.py
index 4b002eef310a..09ca85145f35 100644
--- a/openedx/core/djangoapps/user_authn/tests/utils.py
+++ b/openedx/core/djangoapps/user_authn/tests/utils.py
@@ -58,7 +58,7 @@ class AuthAndScopesTestMixin:
             self.student.
     """
     default_scopes = None
-    user_password = 'test'
+    user_password = 'Password1234'
 
     def setUp(self):
         super().setUp()
diff --git a/openedx/core/djangoapps/user_authn/views/tests/test_password.py b/openedx/core/djangoapps/user_authn/views/tests/test_password.py
index 764a2178af36..a403298a6e78 100644
--- a/openedx/core/djangoapps/user_authn/views/tests/test_password.py
+++ b/openedx/core/djangoapps/user_authn/views/tests/test_password.py
@@ -99,8 +99,8 @@ class TestPasswordChange(CreateAccountMixin, CacheIsolationTestCase):
 
     USERNAME = "heisenberg"
     ALTERNATE_USERNAME = "walt"
-    OLD_PASSWORD = "ḅḷüëṡḳÿ"
-    NEW_PASSWORD = "B🄸🄶B🄻🅄🄴"
+    OLD_PASSWORD = "ḅḷüëṡḳÿ1"
+    NEW_PASSWORD = "B🄸🄶B🄻🅄🄴1"
     OLD_EMAIL = "walter@graymattertech.com"
     NEW_EMAIL = "walt@savewalterwhite.com"
 
@@ -192,11 +192,11 @@ def test_password_change_from_support_tools(self, is_superuser, is_staff, reset_
         UserFactory.create(
             username='edx',
             email='edx@example.com',
-            password='edx',
+            password='Password1234',
             is_superuser=is_superuser,
             is_staff=is_staff,
         )
-        self.client.login(username='edx', password='edx')
+        self.client.login(username='edx', password='Password1234')
 
         response = self._change_password_from_support(email_from_support_tools=self.OLD_EMAIL)
         assert response.status_code == 200
diff --git a/openedx/core/djangoapps/user_authn/views/tests/test_register.py b/openedx/core/djangoapps/user_authn/views/tests/test_register.py
index 59ae98bb155f..20261ab9a9dc 100644
--- a/openedx/core/djangoapps/user_authn/views/tests/test_register.py
+++ b/openedx/core/djangoapps/user_authn/views/tests/test_register.py
@@ -2728,20 +2728,30 @@ def test_username_invalid_ascii_validation_decision(self, username):
             {"username": str(USERNAME_INVALID_CHARS_ASCII)}
         )
 
+    @override_settings(AUTH_PASSWORD_VALIDATORS=[
+        create_validator_config(
+            'common.djangoapps.util.password_policy_validators.MinimumLengthValidator', {'min_length': 4}
+        )
+    ])
     def test_password_empty_validation_decision(self):
         # 2 is the default setting for minimum length found in lms/envs/common.py
         # under AUTH_PASSWORD_VALIDATORS.MinimumLengthValidator
-        msg = 'This password is too short. It must contain at least 2 characters.'
+        msg = 'This password is too short. It must contain at least 4 characters.'
         self.assertValidationDecision(
             {'password': ''},
             {"password": msg}
         )
 
+    @override_settings(AUTH_PASSWORD_VALIDATORS=[
+        create_validator_config(
+            'common.djangoapps.util.password_policy_validators.MinimumLengthValidator', {'min_length': 4}
+        )
+    ])
     def test_password_bad_min_length_validation_decision(self):
         password = 'p'
         # 2 is the default setting for minimum length found in lms/envs/common.py
         # under AUTH_PASSWORD_VALIDATORS.MinimumLengthValidator
-        msg = 'This password is too short. It must contain at least 2 characters.'
+        msg = 'This password is too short. It must contain at least 4 characters.'
         self.assertValidationDecision(
             {'password': password},
             {"password": msg}
diff --git a/openedx/core/djangoapps/util/management/commands/update_fixtures.py b/openedx/core/djangoapps/util/management/commands/update_fixtures.py
deleted file mode 100644
index 53e7db56eae4..000000000000
--- a/openedx/core/djangoapps/util/management/commands/update_fixtures.py
+++ /dev/null
@@ -1,30 +0,0 @@
-"""
-Django management command to update the loaded test fixtures as necessary for
-the current test environment.  Currently just sets an appropriate domain for
-each Site fixture.
-"""
-
-
-import os
-
-from django.contrib.sites.models import Site
-from django.core.management.base import BaseCommand
-
-
-class Command(BaseCommand):
-    """
-    update_fixtures management command
-    """
-
-    help = "Update fixtures to match the current test environment."
-
-    def handle(self, *args, **options):
-        if 'BOK_CHOY_HOSTNAME' in os.environ:
-            # Fix the Site fixture domains so third party auth tests work correctly
-            host = os.environ['BOK_CHOY_HOSTNAME']
-            cms_port = os.environ['BOK_CHOY_CMS_PORT']
-            lms_port = os.environ['BOK_CHOY_LMS_PORT']
-            cms_domain = f'{host}:{cms_port}'
-            Site.objects.filter(name='cms').update(domain=cms_domain)
-            lms_domain = f'{host}:{lms_port}'
-            Site.objects.filter(name='lms').update(domain=lms_domain)
diff --git a/openedx/core/djangoapps/util/tests/test_update_fixtures.py b/openedx/core/djangoapps/util/tests/test_update_fixtures.py
deleted file mode 100644
index fb43fa34a88c..000000000000
--- a/openedx/core/djangoapps/util/tests/test_update_fixtures.py
+++ /dev/null
@@ -1,42 +0,0 @@
-"""  # lint-amnesty, pylint: disable=django-not-configured
-Tests of the update_fixtures management command for bok-choy test database
-initialization.
-"""
-
-
-import os
-
-import pytest
-from django.contrib.sites.models import Site
-from django.core.management import call_command
-
-
-@pytest.fixture(scope='function')
-def sites(db):  # lint-amnesty, pylint: disable=unused-argument
-    Site.objects.create(name='cms', domain='localhost:8031')
-    Site.objects.create(name='lms', domain='localhost:8003')
-
-
-def test_localhost(db, monkeypatch, sites):  # lint-amnesty, pylint: disable=redefined-outer-name, unused-argument
-    monkeypatch.delitem(os.environ, 'BOK_CHOY_HOSTNAME', raising=False)
-    call_command('update_fixtures')
-    assert Site.objects.get(name='cms').domain == 'localhost:8031'
-    assert Site.objects.get(name='lms').domain == 'localhost:8003'
-
-
-def test_devstack_cms(db, monkeypatch, sites):  # lint-amnesty, pylint: disable=redefined-outer-name, unused-argument
-    monkeypatch.setitem(os.environ, 'BOK_CHOY_HOSTNAME', 'edx.devstack.cms')
-    monkeypatch.setitem(os.environ, 'BOK_CHOY_CMS_PORT', '18031')
-    monkeypatch.setitem(os.environ, 'BOK_CHOY_LMS_PORT', '18003')
-    call_command('update_fixtures')
-    assert Site.objects.get(name='cms').domain == 'edx.devstack.cms:18031'
-    assert Site.objects.get(name='lms').domain == 'edx.devstack.cms:18003'
-
-
-def test_devstack_lms(db, monkeypatch, sites):  # lint-amnesty, pylint: disable=redefined-outer-name, unused-argument
-    monkeypatch.setitem(os.environ, 'BOK_CHOY_HOSTNAME', 'edx.devstack.lms')
-    monkeypatch.setitem(os.environ, 'BOK_CHOY_CMS_PORT', '18031')
-    monkeypatch.setitem(os.environ, 'BOK_CHOY_LMS_PORT', '18003')
-    call_command('update_fixtures')
-    assert Site.objects.get(name='cms').domain == 'edx.devstack.lms:18031'
-    assert Site.objects.get(name='lms').domain == 'edx.devstack.lms:18003'
diff --git a/openedx/core/djangoapps/video_config/toggles.py b/openedx/core/djangoapps/video_config/toggles.py
index 6552f7366417..f417537b547e 100644
--- a/openedx/core/djangoapps/video_config/toggles.py
+++ b/openedx/core/djangoapps/video_config/toggles.py
@@ -15,3 +15,25 @@
 PUBLIC_VIDEO_SHARE = CourseWaffleFlag(
     f'{WAFFLE_FLAG_NAMESPACE}.public_video_share', __name__
 )
+
+# .. toggle_name: video_config.transcript_feedback
+# .. toggle_implementation: CourseWaffleFlag
+# .. toggle_default: False
+# .. toggle_description: Gates access to the transcript feedback widget feature.
+# .. toggle_use_cases: temporary, opt_in
+# .. toggle_creation_date: 2023-05-10
+# .. toggle_target_removal_date: None
+TRANSCRIPT_FEEDBACK = CourseWaffleFlag(
+    f'{WAFFLE_FLAG_NAMESPACE}.transcript_feedback', __name__
+)
+
+# .. toggle_name: video_config.xpert_translations_ui
+# .. toggle_implementation: CourseWaffleFlag
+# .. toggle_default: False
+# .. toggle_description: Gates access to the Xpert Translations UI feature.
+# .. toggle_use_cases: temporary, opt_in
+# .. toggle_creation_date: 2023-10-11
+# .. toggle_target_removal_date: None
+XPERT_TRANSLATIONS_UI = CourseWaffleFlag(
+    f'{WAFFLE_FLAG_NAMESPACE}.xpert_translations_ui', __name__
+)
diff --git a/openedx/core/djangoapps/xblock/runtime/shims.py b/openedx/core/djangoapps/xblock/runtime/shims.py
index abef606bcf18..18aa41eb91f3 100644
--- a/openedx/core/djangoapps/xblock/runtime/shims.py
+++ b/openedx/core/djangoapps/xblock/runtime/shims.py
@@ -141,7 +141,7 @@ def render_template(self, template_name, dictionary, namespace='main'):
         warnings.warn(
             "Use of runtime.render_template is deprecated. "
             "For template files included with your XBlock (which is preferable), use "
-            "xblockutils.resources.ResourceLoader.render_mako_template to render them, or use a JavaScript-based "
+            "xblock.utils.resources.ResourceLoader.render_mako_template to render them, or use a JavaScript-based "
             "template instead. For template files that are part of the LMS/Studio, use the 'mako' XBlock service.",
             DeprecationWarning, stacklevel=2,
         )
diff --git a/openedx/core/djangoapps/xblock/tests/test_utils.py b/openedx/core/djangoapps/xblock/tests/test_utils.py
index c8181165c714..229406e1bca1 100644
--- a/openedx/core/djangoapps/xblock/tests/test_utils.py
+++ b/openedx/core/djangoapps/xblock/tests/test_utils.py
@@ -136,6 +136,7 @@ def test_secure_token(param_delta: dict, expected_validation: bool):
         SECRET_KEY=params["generation_secret_key"],
         XBLOCK_HANDLER_TOKEN_KEYS=params["generation_xblock_handler_token_keys"],
     ):
+        assert isinstance(reference_time, datetime.datetime)
         with freeze_time(reference_time):
             token = get_secure_token_for_xblock_handler(
                 params["generation_user_id"], params["generation_block_key_str"]
@@ -145,7 +146,9 @@ def test_secure_token(param_delta: dict, expected_validation: bool):
         SECRET_KEY=params["validation_secret_key"],
         XBLOCK_HANDLER_TOKEN_KEYS=params["validation_xblock_handler_token_keys"],
     ):
-        with freeze_time(reference_time + datetime.timedelta(seconds=params["validation_time_delta_s"])):
+        assert isinstance(params["validation_time_delta_s"], int)
+        new_reference_time = reference_time + datetime.timedelta(seconds=float(params["validation_time_delta_s"]))
+        with freeze_time(new_reference_time):
             assert (
                 validate_secure_token_for_xblock_handler(
                     params["validation_user_id"], params["validation_block_key_str"], token
diff --git a/openedx/core/lib/api/test_utils.py b/openedx/core/lib/api/test_utils.py
index 20a26ea4a52d..6a647b485427 100644
--- a/openedx/core/lib/api/test_utils.py
+++ b/openedx/core/lib/api/test_utils.py
@@ -64,6 +64,10 @@ def assertHttpCreated(self, response):
         """Assert that the given response has the status code 201"""
         assert response.status_code == 201
 
+    def assertHttpNotAuthorized(self, response):
+        """Assert that the given response has the status code 401"""
+        assert response.status_code == 401
+
     def assertHttpForbidden(self, response):
         """Assert that the given response has the status code 403"""
         assert response.status_code == 403
diff --git a/openedx/core/lib/logsettings.py b/openedx/core/lib/logsettings.py
index 8a35865b0909..f813be5c8fb7 100644
--- a/openedx/core/lib/logsettings.py
+++ b/openedx/core/lib/logsettings.py
@@ -126,6 +126,38 @@ def log_python_warnings():
     warnings.filterwarnings('ignore', 'Setting _field_data is deprecated')
     warnings.filterwarnings('ignore', 'Setting _field_data via the constructor is deprecated')
     warnings.filterwarnings('ignore', '.*unclosed.*', category=ResourceWarning)
+    # Remove default_app_config warning after updating Django to 4.2
+    warnings.filterwarnings(
+        'ignore',
+        '.*You can remove default_app_config.*',
+        category=PendingDeprecationWarning
+    )
+    warnings.filterwarnings(
+        'ignore',
+        'Instead access HTTPResponse.headers directly.*',
+        category=DeprecationWarning,
+        module='elasticsearch'
+    )
+    warnings.filterwarnings(
+        'ignore',
+        'Using or importing the ABCs from \'collections\' instead of from \'collections.abc\' is deprecated.*',
+        category=DeprecationWarning,
+        module="sass",
+    )
+    warnings.filterwarnings(
+        'ignore',
+        'Deprecated call to `pkg_resources.declare_namespace.*',
+        category=DeprecationWarning,
+    )
+    warnings.filterwarnings(
+        'ignore',
+        '.*pkg_resources is deprecated as an API.*',
+        category=DeprecationWarning,
+    )
+    warnings.filterwarnings(
+        'ignore', "'etree' is deprecated. Use 'xml.etree.ElementTree' instead.",
+        category=DeprecationWarning, module='wiki'
+    )
     # try:
     #     # There are far too many of these deprecation warnings in startup to output for every management command;
     #     # suppress them until we've fixed at least the most common ones as reported by the test suite
diff --git a/openedx/features/content_type_gating/tests/test_access.py b/openedx/features/content_type_gating/tests/test_access.py
index c66359fc923a..c42a530e3ccf 100644
--- a/openedx/features/content_type_gating/tests/test_access.py
+++ b/openedx/features/content_type_gating/tests/test_access.py
@@ -1,7 +1,6 @@
 """
 Test audit user's access to various content based on content-gating features.
 """
-import os
 from datetime import datetime, timedelta
 from unittest.mock import patch, Mock
 
@@ -228,8 +227,7 @@ def setUpClass(cls):
                 graded=False,
             )
             cls.graded_score_weight_blocks[(graded, has_score, weight)] = block
-
-        host = os.environ.get('BOK_CHOY_HOSTNAME', '127.0.0.1')
+        host = '127.0.0.1'
         metadata_lti_xblock = {
             'lti_id': 'correct_lti_id',
             'launch_url': 'http://{}:{}/{}'.format(host, '8765', 'correct_lti_endpoint'),
diff --git a/openedx/features/course_duration_limits/tests/test_course_expiration.py b/openedx/features/course_duration_limits/tests/test_course_expiration.py
index 32a352d66e6e..b794ef3076c4 100644
--- a/openedx/features/course_duration_limits/tests/test_course_expiration.py
+++ b/openedx/features/course_duration_limits/tests/test_course_expiration.py
@@ -249,7 +249,7 @@ def test_masquerade(self, masquerade_config, show_expiration_banner, mock_get_co
             mode='audit'
         )
         CourseInstructorRole(self.course.id).add_users(instructor)
-        self.client.login(username=instructor.username, password='test')
+        self.client.login(username=instructor.username, password=self.TEST_PASSWORD)
 
         self.update_masquerade(**masquerade_config)
 
@@ -285,7 +285,7 @@ def test_masquerade_in_holdback(self, mock_get_course_run_details):
             mode='audit'
         )
         CourseInstructorRole(self.course.id).add_users(instructor)
-        self.client.login(username=instructor.username, password='test')
+        self.client.login(username=instructor.username, password=self.TEST_PASSWORD)
 
         self.update_masquerade(username='audit')
 
@@ -320,7 +320,7 @@ def test_masquerade_expired(self, mock_get_course_run_details):
             mode='audit'
         )
         CourseInstructorRole(self.course.id).add_users(instructor)
-        self.client.login(username=instructor.username, password='test')
+        self.client.login(username=instructor.username, password=self.TEST_PASSWORD)
 
         self.update_masquerade(username='audit')
 
@@ -370,7 +370,7 @@ def test_no_banner_when_masquerading_as_staff(self, role_factory, mock_get_cours
             mode='audit'
         )
 
-        self.client.login(username=staff_user.username, password='test')
+        self.client.login(username=staff_user.username, password=self.TEST_PASSWORD)
 
         self.update_masquerade(username=expired_staff.username)
 
@@ -418,7 +418,7 @@ def test_no_banner_when_masquerading_as_forum_staff(self, role_name, mock_get_co
             mode='audit'
         )
 
-        self.client.login(username=staff_user.username, password='test')
+        self.client.login(username=staff_user.username, password=self.TEST_PASSWORD)
 
         self.update_masquerade(username=expired_staff.username)
 
diff --git a/openedx/features/course_experience/tests/views/test_course_sock.py b/openedx/features/course_experience/tests/views/test_course_sock.py
index cdc80168ab1c..5c612e3ca85f 100644
--- a/openedx/features/course_experience/tests/views/test_course_sock.py
+++ b/openedx/features/course_experience/tests/views/test_course_sock.py
@@ -20,7 +20,7 @@
 
 from .helpers import add_course_mode
 
-TEST_PASSWORD = 'test'
+TEST_PASSWORD = 'Password1234'
 TEST_VERIFICATION_SOCK_LOCATOR = '<div class="verification-sock"'
 
 
diff --git a/openedx/features/course_experience/tests/views/test_masquerade.py b/openedx/features/course_experience/tests/views/test_masquerade.py
index 0e9660c0158d..0f555e27f7e2 100644
--- a/openedx/features/course_experience/tests/views/test_masquerade.py
+++ b/openedx/features/course_experience/tests/views/test_masquerade.py
@@ -17,7 +17,7 @@
 from .helpers import add_course_mode
 from .test_course_sock import TEST_VERIFICATION_SOCK_LOCATOR
 
-TEST_PASSWORD = 'test'
+TEST_PASSWORD = 'Password1234'
 
 
 class MasqueradeTestBase(SharedModuleStoreTestCase, MasqueradeMixin):
diff --git a/openedx/features/learner_profile/static/learner_profile/js/learner_profile_factory.js b/openedx/features/learner_profile/static/learner_profile/js/learner_profile_factory.js
index 6419dd17703a..d4f81ae7f47c 100644
--- a/openedx/features/learner_profile/static/learner_profile/js/learner_profile_factory.js
+++ b/openedx/features/learner_profile/static/learner_profile/js/learner_profile_factory.js
@@ -14,14 +14,12 @@
         'js/views/fields',
         'learner_profile/js/views/learner_profile_fields',
         'learner_profile/js/views/learner_profile_view',
-        'learner_profile/js/models/badges_model',
-        'learner_profile/js/views/badge_list_container',
         'js/student_account/views/account_settings_fields',
         'js/views/message_banner',
         'string_utils'
     ], function(gettext, $, _, Backbone, Logger, StringUtils, PagingCollection, AccountSettingsModel,
-        AccountPreferencesModel, FieldsView, LearnerProfileFieldsView, LearnerProfileView, BadgeModel,
-        BadgeListContainer, AccountSettingsFieldViews, MessageBannerView) {
+        AccountPreferencesModel, FieldsView, LearnerProfileFieldsView, LearnerProfileView,
+        AccountSettingsFieldViews, MessageBannerView) {
         return function(options) {
             var $learnerProfileElement = $('.wrapper-profile');
 
@@ -55,9 +53,6 @@
                 nameFieldView,
                 sectionOneFieldViews,
                 sectionTwoFieldViews,
-                BadgeCollection,
-                badgeCollection,
-                badgeListContainer,
                 learnerProfileView,
                 getProfileVisibility,
                 showLearnerProfileView;
@@ -172,26 +167,6 @@
                 })
             ];
 
-            BadgeCollection = PagingCollection.extend({
-                queryParams: {
-                    currentPage: 'current_page'
-                }
-            });
-            badgeCollection = new BadgeCollection();
-            badgeCollection.url = options.badges_api_url;
-
-            badgeListContainer = new BadgeListContainer({
-                attributes: {class: 'badge-set-display'},
-                collection: badgeCollection,
-                find_courses_url: options.find_courses_url,
-                ownProfile: options.own_profile,
-                badgeMeta: {
-                    badges_logo: options.badges_logo,
-                    backpack_ui_img: options.backpack_ui_img,
-                    badges_icon: options.badges_icon
-                }
-            });
-
             learnerProfileView = new LearnerProfileView({
                 el: $learnerProfileElement,
                 ownProfile: options.own_profile,
@@ -204,7 +179,6 @@
                 nameFieldView: nameFieldView,
                 sectionOneFieldViews: sectionOneFieldViews,
                 sectionTwoFieldViews: sectionTwoFieldViews,
-                badgeListContainer: badgeListContainer,
                 platformName: options.platform_name
             });
 
@@ -239,7 +213,6 @@
                 accountSettingsModel: accountSettingsModel,
                 accountPreferencesModel: accountPreferencesModel,
                 learnerProfileView: learnerProfileView,
-                badgeListContainer: badgeListContainer
             };
         };
     });
diff --git a/openedx/features/learner_profile/static/learner_profile/js/models/badges_model.js b/openedx/features/learner_profile/static/learner_profile/js/models/badges_model.js
deleted file mode 100644
index 42da19ef7677..000000000000
--- a/openedx/features/learner_profile/static/learner_profile/js/models/badges_model.js
+++ /dev/null
@@ -1,8 +0,0 @@
-(function(define) {
-    'use strict';
-
-    define(['backbone'], function(Backbone) {
-        var BadgesModel = Backbone.Model.extend({});
-        return BadgesModel;
-    });
-}).call(this, define || RequireJS.define);
diff --git a/openedx/features/learner_profile/static/learner_profile/js/spec/learner_profile_factory_spec.js b/openedx/features/learner_profile/static/learner_profile/js/spec/learner_profile_factory_spec.js
index f5b8f4bec6b5..0019c2fc136f 100644
--- a/openedx/features/learner_profile/static/learner_profile/js/spec/learner_profile_factory_spec.js
+++ b/openedx/features/learner_profile/static/learner_profile/js/spec/learner_profile_factory_spec.js
@@ -31,7 +31,6 @@ define(
                 return new LearnerProfilePage({
                     accounts_api_url: Helpers.USER_ACCOUNTS_API_URL,
                     preferences_api_url: Helpers.USER_PREFERENCES_API_URL,
-                    badges_api_url: Helpers.BADGES_API_URL,
                     own_profile: ownProfile,
                     account_settings_page_url: Helpers.USER_ACCOUNTS_API_URL,
                     country_options: Helpers.FIELD_OPTIONS,
@@ -68,148 +67,6 @@ define(
                 LearnerProfileHelpers.expectLimitedProfileSectionsAndFieldsToBeRendered(learnerProfileView);
             });
 
-            it("doesn't show the mode toggle if badges are disabled", function() {
-                var requests = AjaxHelpers.requests(this),
-                    context = createProfilePage(true, {accomplishments_shared: false}),
-                    tabbedView = context.learnerProfileView.tabbedView,
-                    learnerProfileView = context.learnerProfileView;
-
-                LearnerProfileHelpers.expectTabbedViewToBeUndefined(requests, tabbedView);
-                LearnerProfileHelpers.expectBadgesHidden(learnerProfileView);
-            });
-
-            it("doesn't show the mode toggle if badges fail to fetch", function() {
-                var requests = AjaxHelpers.requests(this),
-                    context = createProfilePage(true, {accomplishments_shared: false}),
-                    tabbedView = context.learnerProfileView.tabbedView,
-                    learnerProfileView = context.learnerProfileView;
-
-                LearnerProfileHelpers.expectTabbedViewToBeUndefined(requests, tabbedView);
-                LearnerProfileHelpers.expectBadgesHidden(learnerProfileView);
-            });
-
-            it('renders the mode toggle if there are badges', function() {
-                var requests = AjaxHelpers.requests(this),
-                    context = createProfilePage(true, {accomplishments_shared: true}),
-                    tabbedView = context.learnerProfileView.tabbedView;
-
-                AjaxHelpers.expectRequest(requests, 'POST', '/event');
-                AjaxHelpers.respondWithError(requests, 404);
-                AjaxHelpers.respondWithJson(requests, LearnerProfileHelpers.firstPageBadges);
-
-                LearnerProfileHelpers.expectTabbedViewToBeShown(tabbedView);
-            });
-
-            it('renders the mode toggle if badges enabled but none exist', function() {
-                var requests = AjaxHelpers.requests(this),
-                    context = createProfilePage(true, {accomplishments_shared: true}),
-                    tabbedView = context.learnerProfileView.tabbedView;
-
-                AjaxHelpers.expectRequest(requests, 'POST', '/event');
-                AjaxHelpers.respondWithError(requests, 404);
-                AjaxHelpers.respondWithJson(requests, LearnerProfileHelpers.emptyBadges);
-
-                LearnerProfileHelpers.expectTabbedViewToBeShown(tabbedView);
-            });
-
-            it('displays the badges when the accomplishments toggle is selected', function() {
-                var requests = AjaxHelpers.requests(this),
-                    context = createProfilePage(true, {accomplishments_shared: true}),
-                    learnerProfileView = context.learnerProfileView,
-                    tabbedView = learnerProfileView.tabbedView;
-
-                AjaxHelpers.expectRequest(requests, 'POST', '/event');
-                AjaxHelpers.respondWithError(requests, 404);
-                AjaxHelpers.respondWithJson(requests, LearnerProfileHelpers.secondPageBadges);
-
-                LearnerProfileHelpers.expectBadgesHidden(learnerProfileView);
-                tabbedView.$el.find('[data-url="accomplishments"]').click();
-                LearnerProfileHelpers.expectBadgesDisplayed(learnerProfileView, 10, false);
-                tabbedView.$el.find('[data-url="about_me"]').click();
-                LearnerProfileHelpers.expectBadgesHidden(learnerProfileView);
-            });
-
-            it('displays a placeholder on the last page of badges', function() {
-                var requests = AjaxHelpers.requests(this),
-                    context = createProfilePage(true, {accomplishments_shared: true}),
-                    learnerProfileView = context.learnerProfileView,
-                    tabbedView = learnerProfileView.tabbedView;
-
-                AjaxHelpers.expectRequest(requests, 'POST', '/event');
-                AjaxHelpers.respondWithError(requests, 404);
-                AjaxHelpers.respondWithJson(requests, LearnerProfileHelpers.thirdPageBadges);
-
-                LearnerProfileHelpers.expectBadgesHidden(learnerProfileView);
-                tabbedView.$el.find('[data-url="accomplishments"]').click();
-                LearnerProfileHelpers.expectBadgesDisplayed(learnerProfileView, 10, true);
-                tabbedView.$el.find('[data-url="about_me"]').click();
-                LearnerProfileHelpers.expectBadgesHidden(learnerProfileView);
-            });
-
-            it('displays a placeholder when the accomplishments toggle is selected and no badges exist', function() {
-                var requests = AjaxHelpers.requests(this),
-                    context = createProfilePage(true, {accomplishments_shared: true}),
-                    learnerProfileView = context.learnerProfileView,
-                    tabbedView = learnerProfileView.tabbedView;
-
-                AjaxHelpers.expectRequest(requests, 'POST', '/event');
-                AjaxHelpers.respondWithError(requests, 404);
-                AjaxHelpers.respondWithJson(requests, LearnerProfileHelpers.emptyBadges);
-
-                LearnerProfileHelpers.expectBadgesHidden(learnerProfileView);
-                tabbedView.$el.find('[data-url="accomplishments"]').click();
-                LearnerProfileHelpers.expectBadgesDisplayed(learnerProfileView, 0, true);
-                tabbedView.$el.find('[data-url="about_me"]').click();
-                LearnerProfileHelpers.expectBadgesHidden(learnerProfileView);
-            });
-
-            it('shows a paginated list of badges', function() {
-                var requests = AjaxHelpers.requests(this),
-                    context = createProfilePage(true, {accomplishments_shared: true}),
-                    learnerProfileView = context.learnerProfileView,
-                    tabbedView = learnerProfileView.tabbedView;
-
-                AjaxHelpers.expectRequest(requests, 'POST', '/event');
-                AjaxHelpers.respondWithError(requests, 404);
-                AjaxHelpers.respondWithJson(requests, LearnerProfileHelpers.firstPageBadges);
-
-                tabbedView.$el.find('[data-url="accomplishments"]').click();
-                LearnerProfileHelpers.expectBadgesDisplayed(learnerProfileView, 10, false);
-                LearnerProfileHelpers.expectPage(learnerProfileView, LearnerProfileHelpers.firstPageBadges);
-            });
-
-            it('allows forward and backward navigation of badges', function() {
-                var requests = AjaxHelpers.requests(this),
-                    context = createProfilePage(true, {accomplishments_shared: true}),
-                    learnerProfileView = context.learnerProfileView,
-                    tabbedView = learnerProfileView.tabbedView,
-                    badgeListContainer = context.badgeListContainer;
-
-                AjaxHelpers.expectRequest(requests, 'POST', '/event');
-                AjaxHelpers.respondWithError(requests, 404);
-                AjaxHelpers.respondWithJson(requests, LearnerProfileHelpers.firstPageBadges);
-
-                tabbedView.$el.find('[data-url="accomplishments"]').click();
-
-                badgeListContainer.$el.find('.next-page-link').click();
-                AjaxHelpers.respondWithJson(requests, LearnerProfileHelpers.secondPageBadges);
-                LearnerProfileHelpers.expectPage(learnerProfileView, LearnerProfileHelpers.secondPageBadges);
-
-                badgeListContainer.$el.find('.next-page-link').click();
-                AjaxHelpers.respondWithJson(requests, LearnerProfileHelpers.thirdPageBadges);
-                LearnerProfileHelpers.expectBadgesDisplayed(learnerProfileView, 10, true);
-                LearnerProfileHelpers.expectPage(learnerProfileView, LearnerProfileHelpers.thirdPageBadges);
-
-                badgeListContainer.$el.find('.previous-page-link').click();
-                AjaxHelpers.respondWithJson(requests, LearnerProfileHelpers.secondPageBadges);
-                LearnerProfileHelpers.expectPage(learnerProfileView, LearnerProfileHelpers.secondPageBadges);
-                LearnerProfileHelpers.expectBadgesDisplayed(learnerProfileView, 10, false);
-
-                badgeListContainer.$el.find('.previous-page-link').click();
-                AjaxHelpers.respondWithJson(requests, LearnerProfileHelpers.firstPageBadges);
-                LearnerProfileHelpers.expectPage(learnerProfileView, LearnerProfileHelpers.firstPageBadges);
-            });
-
             it('renders the limited profile for under 13 users', function() {
                 var context = createProfilePage(
                     true,
diff --git a/openedx/features/learner_profile/static/learner_profile/js/spec/views/badge_list_container_spec.js b/openedx/features/learner_profile/static/learner_profile/js/spec/views/badge_list_container_spec.js
deleted file mode 100644
index 20342c4a6709..000000000000
--- a/openedx/features/learner_profile/static/learner_profile/js/spec/views/badge_list_container_spec.js
+++ /dev/null
@@ -1,99 +0,0 @@
-define([
-    'backbone',
-    'jquery',
-    'underscore',
-    'URI',
-    'edx-ui-toolkit/js/utils/spec-helpers/ajax-helpers',
-    'edx-ui-toolkit/js/pagination/paging-collection',
-    'learner_profile/js/spec_helpers/helpers',
-    'learner_profile/js/views/badge_list_container'
-],
-function(Backbone, $, _, URI, AjaxHelpers, PagingCollection, LearnerProfileHelpers, BadgeListContainer) {
-    'use strict';
-
-    describe('edx.user.BadgeListContainer', function() {
-        var view;
-
-        var createView = function(requests, pageNum, badgeListObject) {
-            var BadgeCollection = PagingCollection.extend({
-                queryParams: {
-                    currentPage: 'current_page'
-                }
-            });
-            var badgeCollection = new BadgeCollection();
-            var models = [];
-            var badgeListContainer;
-            var request;
-            var path;
-            badgeCollection.url = '/api/badges/v1/assertions/user/staff/';
-            _.each(_.range(badgeListObject.count), function(idx) {
-                models.push(LearnerProfileHelpers.makeBadge(idx));
-            });
-            badgeListObject.results = models; // eslint-disable-line no-param-reassign
-            badgeCollection.setPage(pageNum);
-            request = AjaxHelpers.currentRequest(requests);
-            path = new URI(request.url).path();
-            expect(path).toBe('/api/badges/v1/assertions/user/staff/');
-            AjaxHelpers.respondWithJson(requests, badgeListObject);
-            badgeListContainer = new BadgeListContainer({
-                collection: badgeCollection
-
-            });
-            badgeListContainer.render();
-            return badgeListContainer;
-        };
-
-        afterEach(function() {
-            view.$el.remove();
-        });
-
-        it('displays all badges', function() {
-            var requests = AjaxHelpers.requests(this),
-                badges;
-            view = createView(requests, 1, {
-                count: 30,
-                previous: '/arbitrary/url',
-                num_pages: 3,
-                next: null,
-                start: 20,
-                current_page: 1,
-                results: []
-            });
-            badges = view.$el.find('div.badge-display');
-            expect(badges.length).toBe(30);
-        });
-
-        it('displays placeholder on last page', function() {
-            var requests = AjaxHelpers.requests(this),
-                placeholder;
-            view = createView(requests, 3, {
-                count: 30,
-                previous: '/arbitrary/url',
-                num_pages: 3,
-                next: null,
-                start: 20,
-                current_page: 3,
-                results: []
-            });
-            placeholder = view.$el.find('span.accomplishment-placeholder');
-            expect(placeholder.length).toBe(1);
-        });
-
-        it('does not display placeholder on first page', function() {
-            var requests = AjaxHelpers.requests(this),
-                placeholder;
-            view = createView(requests, 1, {
-                count: 30,
-                previous: '/arbitrary/url',
-                num_pages: 3,
-                next: null,
-                start: 0,
-                current_page: 1,
-                results: []
-            });
-            placeholder = view.$el.find('span.accomplishment-placeholder');
-            expect(placeholder.length).toBe(0);
-        });
-    });
-}
-);
diff --git a/openedx/features/learner_profile/static/learner_profile/js/spec/views/badge_list_view_spec.js b/openedx/features/learner_profile/static/learner_profile/js/spec/views/badge_list_view_spec.js
deleted file mode 100644
index e8cfd32d4c38..000000000000
--- a/openedx/features/learner_profile/static/learner_profile/js/spec/views/badge_list_view_spec.js
+++ /dev/null
@@ -1,81 +0,0 @@
-define([
-    'backbone',
-    'jquery',
-    'underscore',
-    'edx-ui-toolkit/js/pagination/paging-collection',
-    'learner_profile/js/spec_helpers/helpers',
-    'learner_profile/js/views/badge_list_view'
-],
-function(Backbone, $, _, PagingCollection, LearnerProfileHelpers, BadgeListView) {
-    'use strict';
-
-    describe('edx.user.BadgeListView', function() {
-        var view;
-
-        var createView = function(badges, pages, page, hasNextPage) {
-            var badgeCollection = new PagingCollection();
-            var models = [];
-            var badgeList;
-            badgeCollection.url = '/api/badges/v1/assertions/user/staff/';
-            _.each(badges, function(element) {
-                models.push(new Backbone.Model(element));
-            });
-            badgeCollection.models = models;
-            badgeCollection.length = badges.length;
-            badgeCollection.currentPage = page;
-            badgeCollection.totalPages = pages;
-            badgeCollection.hasNextPage = function() {
-                return hasNextPage;
-            };
-            badgeList = new BadgeListView({
-                collection: badgeCollection
-
-            });
-            return badgeList;
-        };
-
-        afterEach(function() {
-            view.$el.remove();
-        });
-
-        it('there is a single row if there is only one badge', function() {
-            var rows;
-            view = createView([LearnerProfileHelpers.makeBadge(1)], 1, 1, false);
-            view.render();
-            rows = view.$el.find('div.row');
-            expect(rows.length).toBe(1);
-        });
-
-        it('accomplishments placeholder is visible on a last page', function() {
-            var placeholder;
-            view = createView([LearnerProfileHelpers.makeBadge(1)], 2, 2, false);
-            view.render();
-            placeholder = view.$el.find('span.accomplishment-placeholder');
-            expect(placeholder.length).toBe(1);
-        });
-
-        it('accomplishments placeholder to be not visible on a first page', function() {
-            var placeholder;
-            view = createView([LearnerProfileHelpers.makeBadge(1)], 1, 2, true);
-            view.render();
-            placeholder = view.$el.find('span.accomplishment-placeholder');
-            expect(placeholder.length).toBe(0);
-        });
-
-        it('badges are in two columns (checked by counting rows for a known number of badges)', function() {
-            var badges = [];
-            var placeholder;
-            var rows;
-            _.each(_.range(4), function(item) {
-                badges.push(LearnerProfileHelpers.makeBadge(item));
-            });
-            view = createView(badges, 1, 2, true);
-            view.render();
-            placeholder = view.$el.find('span.accomplishment-placeholder');
-            expect(placeholder.length).toBe(0);
-            rows = view.$el.find('div.row');
-            expect(rows.length).toBe(2);
-        });
-    });
-}
-);
diff --git a/openedx/features/learner_profile/static/learner_profile/js/spec/views/badge_view_spec.js b/openedx/features/learner_profile/static/learner_profile/js/spec/views/badge_view_spec.js
deleted file mode 100644
index 8ac88ae0b17e..000000000000
--- a/openedx/features/learner_profile/static/learner_profile/js/spec/views/badge_view_spec.js
+++ /dev/null
@@ -1,114 +0,0 @@
-define([
-    'backbone', 'jquery', 'underscore',
-    'learner_profile/js/spec_helpers/helpers',
-    'learner_profile/js/views/badge_view'
-],
-function(Backbone, $, _, LearnerProfileHelpers, BadgeView) {
-    'use strict';
-
-    describe('edx.user.BadgeView', function() {
-        var view,
-            badge,
-            testBadgeNameIsDisplayed,
-            testBadgeIconIsDisplayed;
-
-        var createView = function(ownProfile) {
-            var options,
-                testView;
-            badge = LearnerProfileHelpers.makeBadge(1);
-            options = {
-                model: new Backbone.Model(badge),
-                ownProfile: ownProfile,
-                badgeMeta: {}
-            };
-            testView = new BadgeView(options);
-            testView.render();
-            $('body').append(testView.$el);
-            testView.$el.show();
-            expect(testView.$el.is(':visible')).toBe(true);
-            return testView;
-        };
-
-        afterEach(function() {
-            view.$el.remove();
-            $('.badges-modal').remove();
-        });
-
-        it('profile of other has no share button', function() {
-            view = createView(false);
-            expect(view.context.ownProfile).toBeFalsy();
-            expect(view.$el.find('button.share-button').length).toBe(0);
-        });
-
-        it('own profile has share button', function() {
-            view = createView(true);
-            expect(view.context.ownProfile).toBeTruthy();
-            expect(view.$el.find('button.share-button').length).toBe(1);
-        });
-
-        it('click on share button calls createModal function', function() {
-            var shareButton;
-            view = createView(true);
-            spyOn(view, 'createModal');
-            view.delegateEvents();
-            expect(view.context.ownProfile).toBeTruthy();
-            shareButton = view.$el.find('button.share-button');
-            expect(shareButton.length).toBe(1);
-            expect(view.createModal).not.toHaveBeenCalled();
-            shareButton.click();
-            expect(view.createModal).toHaveBeenCalled();
-        });
-
-        it('click on share button calls shows the dialog', function(done) {
-            var shareButton,
-                $modalElement;
-            view = createView(true);
-            expect(view.context.ownProfile).toBeTruthy();
-            shareButton = view.$el.find('button.share-button');
-            expect(shareButton.length).toBe(1);
-            $modalElement = $('.badges-modal');
-            expect($modalElement.length).toBe(0);
-            expect($modalElement.is(':visible')).toBeFalsy();
-            shareButton.click();
-            // Note: this element should have appeared in the dom during: shareButton.click();
-            $modalElement = $('.badges-modal');
-            jasmine.waitUntil(function() {
-                return $modalElement.is(':visible');
-            }).always(done);
-        });
-
-        testBadgeNameIsDisplayed = function(ownProfile) {
-            var badgeDiv;
-            view = createView(ownProfile);
-            badgeDiv = view.$el.find('.badge-name');
-            expect(badgeDiv.length).toBeTruthy();
-            expect(badgeDiv.is(':visible')).toBe(true);
-            expect(_.count(badgeDiv.html(), badge.badge_class.display_name)).toBeTruthy();
-        };
-
-        it('test badge name is displayed for own profile', function() {
-            testBadgeNameIsDisplayed(true);
-        });
-
-        it('test badge name is displayed for other profile', function() {
-            testBadgeNameIsDisplayed(false);
-        });
-
-        testBadgeIconIsDisplayed = function(ownProfile) {
-            var badgeImg;
-            view = createView(ownProfile);
-            badgeImg = view.$el.find('img.badge');
-            expect(badgeImg.length).toBe(1);
-            expect(badgeImg.attr('src')).toEqual(badge.image_url);
-        };
-
-        it('test badge icon is displayed for own profile', function() {
-            testBadgeIconIsDisplayed(true);
-        });
-
-        it('test badge icon is displayed for other profile', function() {
-            testBadgeIconIsDisplayed(false);
-        });
-    });
-}
-);
diff --git a/openedx/features/learner_profile/static/learner_profile/js/spec/views/learner_profile_view_spec.js b/openedx/features/learner_profile/static/learner_profile/js/spec/views/learner_profile_view_spec.js
index 1797b0de05e7..21d2dd0f5df8 100644
--- a/openedx/features/learner_profile/static/learner_profile/js/spec/views/learner_profile_view_spec.js
+++ b/openedx/features/learner_profile/static/learner_profile/js/spec/views/learner_profile_view_spec.js
@@ -15,13 +15,12 @@ define(
         'js/student_account/models/user_preferences_model',
         'learner_profile/js/views/learner_profile_fields',
         'learner_profile/js/views/learner_profile_view',
-        'learner_profile/js/views/badge_list_container',
         'js/student_account/views/account_settings_fields',
         'js/views/message_banner'
     ],
     function(gettext, Backbone, $, _, PagingCollection, AjaxHelpers, TemplateHelpers, Helpers, LearnerProfileHelpers,
         FieldViews, UserAccountModel, AccountPreferencesModel, LearnerProfileFields, LearnerProfileView,
-        BadgeListContainer, AccountSettingsFieldViews, MessageBannerView) {
+        AccountSettingsFieldViews, MessageBannerView) {
         'use strict';
 
         describe('edx.user.LearnerProfileView', function() {
@@ -132,15 +131,6 @@ define(
                     })
                 ];
 
-                var badgeCollection = new PagingCollection();
-                badgeCollection.url = Helpers.BADGES_API_URL;
-
-                var badgeListContainer = new BadgeListContainer({
-                    attributes: {class: 'badge-set-display'},
-                    collection: badgeCollection,
-                    find_courses_url: Helpers.FIND_COURSES_URL
-                });
-
                 return new LearnerProfileView(
                     {
                         el: $('.wrapper-profile'),
@@ -154,7 +144,6 @@ define(
                         profileImageFieldView: profileImageFieldView,
                         sectionOneFieldViews: sectionOneFieldViews,
                         sectionTwoFieldViews: sectionTwoFieldViews,
-                        badgeListContainer: badgeListContainer
                     });
             };
 
@@ -225,16 +214,5 @@ define(
                 Helpers.expectLoadingErrorIsVisible(learnerProfileView, false);
                 LearnerProfileHelpers.expectLimitedProfileSectionsAndFieldsToBeRendered(learnerProfileView, true);
             });
-
-            it("renders an error if the badges can't be fetched", function() {
-                var learnerProfileView = createLearnerProfileView(false, 'all_users', true);
-                learnerProfileView.options.accountSettingsModel.set({accomplishments_shared: true});
-                var requests = AjaxHelpers.requests(this);
-
-                learnerProfileView.render();
-
-                LearnerProfileHelpers.breakBadgeLoading(learnerProfileView, requests);
-                LearnerProfileHelpers.expectBadgeLoadingErrorIsRendered(learnerProfileView);
-            });
         });
     });
diff --git a/openedx/features/learner_profile/static/learner_profile/js/spec/views/share_modal_view_spec.js b/openedx/features/learner_profile/static/learner_profile/js/spec/views/share_modal_view_spec.js
deleted file mode 100644
index e3d15659ffa6..000000000000
--- a/openedx/features/learner_profile/static/learner_profile/js/spec/views/share_modal_view_spec.js
+++ /dev/null
@@ -1,63 +0,0 @@
-define(
-    [
-        'backbone', 'jquery', 'underscore', 'moment',
-        'js/spec/student_account/helpers',
-        'learner_profile/js/spec_helpers/helpers',
-        'learner_profile/js/views/share_modal_view',
-        'jquery.simulate'
-    ],
-    function(Backbone, $, _, Moment, Helpers, LearnerProfileHelpers, ShareModalView) {
-        'use strict';
-
-        describe('edx.user.ShareModalView', function() {
-            var keys = $.simulate.keyCode;
-
-            var view;
-
-            var createModalView = function() {
-                var badge = LearnerProfileHelpers.makeBadge(1);
-                var context = _.extend(badge, {
-                    created: new Moment(badge.created),
-                    ownProfile: true,
-                    badgeMeta: {}
-                });
-                return new ShareModalView({
-                    model: new Backbone.Model(context),
-                    shareButton: $('<button/>')
-                });
-            };
-
-            beforeEach(function() {
-                view = createModalView();
-                // Attach view to document, otherwise click won't work
-                view.render();
-                $('body').append(view.$el);
-                view.$el.show();
-                expect(view.$el.is(':visible')).toBe(true);
-            });
-
-            afterEach(function() {
-                view.$el.remove();
-            });
-
-            it('modal view closes on escape', function() {
-                spyOn(view, 'close');
-                view.delegateEvents();
-                expect(view.close).not.toHaveBeenCalled();
-                $(view.$el).simulate('keydown', {keyCode: keys.ESCAPE});
-                expect(view.close).toHaveBeenCalled();
-            });
-
-            it('modal view closes click on close', function() {
-                var $closeButton;
-                spyOn(view, 'close');
-                view.delegateEvents();
-                $closeButton = view.$el.find('button.close');
-                expect($closeButton.length).toBe(1);
-                expect(view.close).not.toHaveBeenCalled();
-                $closeButton.trigger('click');
-                expect(view.close).toHaveBeenCalled();
-            });
-        });
-    }
-);
diff --git a/openedx/features/learner_profile/static/learner_profile/js/spec_helpers/helpers.js b/openedx/features/learner_profile/static/learner_profile/js/spec_helpers/helpers.js
index 5d4a278907ca..e1369284a4b1 100644
--- a/openedx/features/learner_profile/static/learner_profile/js/spec_helpers/helpers.js
+++ b/openedx/features/learner_profile/static/learner_profile/js/spec_helpers/helpers.js
@@ -123,137 +123,11 @@ define(['underscore', 'URI', 'edx-ui-toolkit/js/utils/spec-helpers/ajax-helpers'
         expect(tabbedViewView.$el.find('.page-content-nav').is(':visible')).toBe(true);
     };
 
-    var expectBadgesDisplayed = function(learnerProfileView, length, lastPage) {
-        var $badgeListingView = $('#tabpanel-accomplishments'),
-            updatedLength = length,
-            placeholder;
-        expect($('#tabpanel-about_me').hasClass('is-hidden')).toBe(true);
-        expect($badgeListingView.hasClass('is-hidden')).toBe(false);
-        if (lastPage) {
-            updatedLength += 1;
-            placeholder = $badgeListingView.find('.find-course');
-            expect(placeholder.length).toBe(1);
-            expect(placeholder.attr('href')).toBe('/courses/');
-        }
-        expect($badgeListingView.find('.badge-display').length).toBe(updatedLength);
-    };
-
-    var expectBadgesHidden = function() {
-        var $accomplishmentsTab = $('#tabpanel-accomplishments');
-        if ($accomplishmentsTab.length) {
-            // Nonexistence counts as hidden.
-            expect($('#tabpanel-accomplishments').hasClass('is-hidden')).toBe(true);
-        }
-        expect($('#tabpanel-about_me').hasClass('is-hidden')).toBe(false);
-    };
-
-    var expectPage = function(learnerProfileView, pageData) {
-        var $badgeListContainer = $('#tabpanel-accomplishments');
-        var index = $badgeListContainer.find('span.search-count').text().trim();
-        expect(index).toBe('Showing ' + (pageData.start + 1) + '-' + (pageData.start + pageData.results.length)
-            + ' out of ' + pageData.count + ' total');
-        expect($badgeListContainer.find('.current-page').text()).toBe('' + pageData.current_page);
-        _.each(pageData.results, function(badge) {
-            expect($('.badge-display:contains(' + badge.badge_class.display_name + ')').length).toBe(1);
-        });
-    };
-
-    var expectBadgeLoadingErrorIsRendered = function() {
-        var errorMessage = $('.badge-set-display').text();
-        expect(errorMessage).toBe(
-            'Your request could not be completed. Reload the page and try again. If the issue persists, click the '
-            + 'Help tab to report the problem.'
-        );
-    };
-
-    var breakBadgeLoading = function(learnerProfileView, requests) {
-        var request = AjaxHelpers.currentRequest(requests);
-        var path = new URI(request.url).path();
-        expect(path).toBe('/api/badges/v1/assertions/user/student/');
-        AjaxHelpers.respondWithError(requests, 500);
-    };
-
-    var firstPageBadges = {
-        count: 30,
-        previous: null,
-        next: '/arbitrary/url',
-        num_pages: 3,
-        start: 0,
-        current_page: 1,
-        results: []
-    };
-
-    var secondPageBadges = {
-        count: 30,
-        previous: '/arbitrary/url',
-        next: '/arbitrary/url',
-        num_pages: 3,
-        start: 10,
-        current_page: 2,
-        results: []
-    };
-
-    var thirdPageBadges = {
-        count: 30,
-        previous: '/arbitrary/url',
-        num_pages: 3,
-        next: null,
-        start: 20,
-        current_page: 3,
-        results: []
-    };
-
-    var emptyBadges = {
-        count: 0,
-        previous: null,
-        num_pages: 1,
-        results: []
-    };
-
-    function makeBadge(num) {
-        return {
-            badge_class: {
-                slug: 'test_slug_' + num,
-                issuing_component: 'test_component',
-                display_name: 'Test Badge ' + num,
-                course_id: null,
-                description: "Yay! It's a test badge.",
-                criteria: 'https://example.com/syllabus',
-                image_url: 'http://localhost:8000/media/badge_classes/test_lMB9bRw.png'
-            },
-            image_url: 'http://example.com/image.png',
-            assertion_url: 'http://example.com/example.json',
-            created_at: '2015-12-03T16:25:57.676113Z'
-        };
-    }
-
-    _.each(_.range(0, 10), function(i) {
-        firstPageBadges.results.push(makeBadge(i));
-    });
-
-    _.each(_.range(10, 20), function(i) {
-        secondPageBadges.results.push(makeBadge(i));
-    });
-
-    _.each(_.range(20, 30), function(i) {
-        thirdPageBadges.results.push(makeBadge(i));
-    });
-
     return {
         expectLimitedProfileSectionsAndFieldsToBeRendered: expectLimitedProfileSectionsAndFieldsToBeRendered,
         expectProfileSectionsAndFieldsToBeRendered: expectProfileSectionsAndFieldsToBeRendered,
         expectProfileSectionsNotToBeRendered: expectProfileSectionsNotToBeRendered,
         expectTabbedViewToBeUndefined: expectTabbedViewToBeUndefined,
-        expectTabbedViewToBeShown: expectTabbedViewToBeShown,
-        expectBadgesDisplayed: expectBadgesDisplayed,
-        expectBadgesHidden: expectBadgesHidden,
-        expectBadgeLoadingErrorIsRendered: expectBadgeLoadingErrorIsRendered,
-        breakBadgeLoading: breakBadgeLoading,
-        firstPageBadges: firstPageBadges,
-        secondPageBadges: secondPageBadges,
-        thirdPageBadges: thirdPageBadges,
-        emptyBadges: emptyBadges,
-        expectPage: expectPage,
-        makeBadge: makeBadge
+        expectTabbedViewToBeShown: expectTabbedViewToBeShown
     };
 });
diff --git a/openedx/features/learner_profile/static/learner_profile/js/views/badge_list_container.js b/openedx/features/learner_profile/static/learner_profile/js/views/badge_list_container.js
deleted file mode 100644
index ca68ca8fa9e8..000000000000
--- a/openedx/features/learner_profile/static/learner_profile/js/views/badge_list_container.js
+++ /dev/null
@@ -1,35 +0,0 @@
-/* eslint-disable no-underscore-dangle */
-(function(define) {
-    'use strict';
-
-    define(
-        [
-            'gettext', 'jquery', 'underscore', 'common/js/components/views/paginated_view',
-            'learner_profile/js/views/badge_view', 'learner_profile/js/views/badge_list_view',
-            'text!learner_profile/templates/badge_list.underscore'
-        ],
-        function(gettext, $, _, PaginatedView, BadgeView, BadgeListView, BadgeListTemplate) {
-            var BadgeListContainer = PaginatedView.extend({
-                type: 'badge',
-
-                itemViewClass: BadgeView,
-
-                listViewClass: BadgeListView,
-
-                viewTemplate: BadgeListTemplate,
-
-                isZeroIndexed: true,
-
-                paginationLabel: gettext('Accomplishments Pagination'),
-
-                initialize: function(options) {
-                    BadgeListContainer.__super__.initialize.call(this, options);
-                    this.listView.find_courses_url = options.find_courses_url;
-                    this.listView.badgeMeta = options.badgeMeta;
-                    this.listView.ownProfile = options.ownProfile;
-                }
-            });
-
-            return BadgeListContainer;
-        });
-}).call(this, define || RequireJS.define);
diff --git a/openedx/features/learner_profile/static/learner_profile/js/views/badge_list_view.js b/openedx/features/learner_profile/static/learner_profile/js/views/badge_list_view.js
deleted file mode 100644
index c30ab9c94ad9..000000000000
--- a/openedx/features/learner_profile/static/learner_profile/js/views/badge_list_view.js
+++ /dev/null
@@ -1,65 +0,0 @@
-(function(define) {
-    'use strict';
-
-    define([
-        'gettext',
-        'jquery',
-        'underscore',
-        'edx-ui-toolkit/js/utils/html-utils',
-        'common/js/components/views/list',
-        'learner_profile/js/views/badge_view',
-        'text!learner_profile/templates/badge_placeholder.underscore'
-    ],
-    function(gettext, $, _, HtmlUtils, ListView, BadgeView, badgePlaceholder) {
-        var BadgeListView = ListView.extend({
-            tagName: 'div',
-
-            template: HtmlUtils.template(badgePlaceholder),
-
-            renderCollection: function() {
-                var self = this,
-                    $row;
-
-                this.$el.empty();
-
-                // Split into two columns.
-                this.collection.each(function(badge, index) {
-                    var $item;
-                    if (index % 2 === 0) {
-                        $row = $('<div class="row">');
-                        this.$el.append($row);
-                    }
-                    $item = new BadgeView({
-                        model: badge,
-                        badgeMeta: this.badgeMeta,
-                        ownProfile: this.ownProfile
-                    }).render().el;
-
-                    if ($row) {
-                        $row.append($item);
-                    }
-
-                    this.itemViews.push($item);
-                }, this);
-                // Placeholder must always be at the end, and may need a new row.
-                if (!this.collection.hasNextPage()) {
-                    // find_courses_url set by BadgeListContainer during initialization.
-                    if (this.collection.length % 2 === 0) {
-                        $row = $('<div class="row">');
-                        this.$el.append($row);
-                    }
-
-                    if ($row) {
-                        HtmlUtils.append(
-                            $row,
-                            this.template({find_courses_url: self.find_courses_url})
-                        );
-                    }
-                }
-                return this;
-            }
-        });
-
-        return BadgeListView;
-    });
-}).call(this, define || RequireJS.define);
diff --git a/openedx/features/learner_profile/static/learner_profile/js/views/badge_view.js b/openedx/features/learner_profile/static/learner_profile/js/views/badge_view.js
deleted file mode 100644
index 854324916985..000000000000
--- a/openedx/features/learner_profile/static/learner_profile/js/views/badge_view.js
+++ /dev/null
@@ -1,47 +0,0 @@
-(function(define) {
-    'use strict';
-
-    define(
-        [
-            'gettext', 'jquery', 'underscore', 'backbone', 'moment',
-            'text!learner_profile/templates/badge.underscore',
-            'learner_profile/js/views/share_modal_view',
-            'edx-ui-toolkit/js/utils/html-utils'
-        ],
-        function(gettext, $, _, Backbone, Moment, badgeTemplate, ShareModalView, HtmlUtils) {
-            var BadgeView = Backbone.View.extend({
-                initialize: function(options) {
-                    this.options = _.extend({}, options);
-                    this.context = _.extend(this.options.model.toJSON(), {
-                        created: new Moment(this.options.model.toJSON().created),
-                        ownProfile: options.ownProfile,
-                        badgeMeta: options.badgeMeta
-                    });
-                },
-                attributes: {
-                    class: 'badge-display'
-                },
-                template: _.template(badgeTemplate),
-                events: {
-                    'click .share-button': 'createModal'
-                },
-                createModal: function() {
-                    var modal = new ShareModalView({
-                        model: new Backbone.Model(this.context),
-                        shareButton: this.shareButton
-                    });
-                    modal.$el.hide();
-                    modal.render();
-                    $('body').append(modal.$el);
-                    modal.$el.fadeIn('short', 'swing', _.bind(modal.ready, modal));
-                },
-                render: function() {
-                    this.$el.html(HtmlUtils.HTML(this.template(this.context)).toString());
-                    this.shareButton = this.$el.find('.share-button');
-                    return this;
-                }
-            });
-
-            return BadgeView;
-        });
-}).call(this, define || RequireJS.define);
diff --git a/openedx/features/learner_profile/static/learner_profile/js/views/learner_profile_view.js b/openedx/features/learner_profile/static/learner_profile/js/views/learner_profile_view.js
index c75a22db14d6..74c0e6b819fb 100644
--- a/openedx/features/learner_profile/static/learner_profile/js/views/learner_profile_view.js
+++ b/openedx/features/learner_profile/static/learner_profile/js/views/learner_profile_view.js
@@ -59,30 +59,12 @@
                     $('.wrapper-profile-section-container-one').removeClass('is-hidden');
                     $('.wrapper-profile-section-container-two').removeClass('is-hidden');
 
-                    // Only show accomplishments if this is a full profile
-                    if (this.showFullProfile()) {
-                        $('.learner-achievements').removeClass('is-hidden');
-                    } else {
-                        $('.learner-achievements').addClass('is-hidden');
-                    }
 
-                    if (this.showFullProfile() && (this.options.accountSettingsModel.get('accomplishments_shared'))) {
+                    if (this.showFullProfile()) {
                         tabs = [
-                            {view: this.sectionTwoView, title: gettext('About Me'), url: 'about_me'},
-                            {
-                                view: this.options.badgeListContainer,
-                                title: gettext('Accomplishments'),
-                                url: 'accomplishments'
-                            }
+                            {view: this.sectionTwoView, title: gettext('About Me'), url: 'about_me'}
                         ];
 
-                        // Build the accomplishments Tab and fill with data
-                        this.options.badgeListContainer.collection.fetch().done(function() {
-                            self.options.badgeListContainer.render();
-                        }).error(function() {
-                            self.options.badgeListContainer.renderError();
-                        });
-
                         this.tabbedView = new TabbedView({
                             tabs: tabs,
                             router: this.router,
diff --git a/openedx/features/learner_profile/static/learner_profile/js/views/share_modal_view.js b/openedx/features/learner_profile/static/learner_profile/js/views/share_modal_view.js
deleted file mode 100644
index c018c3479ba0..000000000000
--- a/openedx/features/learner_profile/static/learner_profile/js/views/share_modal_view.js
+++ /dev/null
@@ -1,56 +0,0 @@
-(function(define) {
-    'use strict';
-
-    define(
-        [
-            'gettext', 'jquery', 'underscore', 'backbone', 'moment',
-            'text!learner_profile/templates/share_modal.underscore',
-            'edx-ui-toolkit/js/utils/html-utils'
-        ],
-        function(gettext, $, _, Backbone, Moment, badgeModalTemplate, HtmlUtils) {
-            var ShareModalView = Backbone.View.extend({
-                attributes: {
-                    class: 'badges-overlay'
-                },
-                template: _.template(badgeModalTemplate),
-                events: {
-                    'click .badges-modal': function(event) { event.stopPropagation(); },
-                    'click .badges-modal .close': 'close',
-                    'click .badges-overlay': 'close',
-                    keydown: 'keyAction',
-                    'focus .focusguard-start': 'focusGuardStart',
-                    'focus .focusguard-end': 'focusGuardEnd'
-                },
-                initialize: function(options) {
-                    this.options = _.extend({}, options);
-                },
-                focusGuardStart: function() {
-                    // Should only be selected directly if shift-tabbing from the start, so grab last item.
-                    this.$el.find('a').last().focus();
-                },
-                focusGuardEnd: function() {
-                    this.$el.find('.badges-modal').focus();
-                },
-                close: function() {
-                    this.$el.fadeOut('short', 'swing', _.bind(this.remove, this));
-                    this.options.shareButton.focus();
-                },
-                keyAction: function(event) {
-                    if (event.keyCode === $.ui.keyCode.ESCAPE) {
-                        this.close();
-                    }
-                },
-                ready: function() {
-                    // Focusing on the modal background directly doesn't work, probably due
-                    // to its positioning.
-                    this.$el.find('.badges-modal').focus();
-                },
-                render: function() {
-                    this.$el.html(HtmlUtils.HTML(this.template(this.model.toJSON())).toString());
-                    return this;
-                }
-            });
-
-            return ShareModalView;
-        });
-}).call(this, define || RequireJS.define);
diff --git a/openedx/features/learner_profile/static/learner_profile/templates/badge.underscore b/openedx/features/learner_profile/static/learner_profile/templates/badge.underscore
deleted file mode 100644
index 10901497270d..000000000000
--- a/openedx/features/learner_profile/static/learner_profile/templates/badge.underscore
+++ /dev/null
@@ -1,30 +0,0 @@
-<div class="badge-image-container">
-  <img class="badge" src="<%- image_url %>" alt=""/>
-</div>
-<div class="badge-details">
-  <div class="badge-name"><%- badge_class.display_name %></div>
-  <p class="badge-description"><%- badge_class.description %></p>
-  <% if (ownProfile) { %>
-    <button class="share-button">
-      <div class="share-icon-container">
-        <img class="icon icon-mozillaopenbadges" src="<%- badgeMeta.badges_icon %>" alt="<%-
-          interpolate(
-            // Translators: display_name is the name of an OpenBadges award.
-            gettext('Share your "%(display_name)s" award'),
-            {'display_name': badge_class.display_name},
-            true
-          )%>">
-      </div>
-      <div class="share-prefix" aria-hidden="true"><%- gettext("Share") %></div>
-    </div>
-  <% } %>
-  <div class="badge-date-stamp">
-    <%-
-      interpolate(
-        // Translators: Date stamp for earned badges. Example: Earned December 3, 2015.
-        gettext('Earned %(created)s.'),
-        {created: created.format('LL')},
-        true
-      )
-    %></div>
-</div>
diff --git a/openedx/features/learner_profile/static/learner_profile/templates/badge_list.underscore b/openedx/features/learner_profile/static/learner_profile/templates/badge_list.underscore
deleted file mode 100644
index 80c2cc2ca72b..000000000000
--- a/openedx/features/learner_profile/static/learner_profile/templates/badge_list.underscore
+++ /dev/null
@@ -1,4 +0,0 @@
-<div class="sr-is-focusable sr-<%- type %>-view" tabindex="-1"></div>
-<div class="<%- type %>-paging-header"></div>
-<div class="<%- type %>-list cards-list"></div>
-<div class="<%- type %>-paging-footer"></div>
diff --git a/openedx/features/learner_profile/static/learner_profile/templates/badge_placeholder.underscore b/openedx/features/learner_profile/static/learner_profile/templates/badge_placeholder.underscore
deleted file mode 100644
index b7eb9976e8e0..000000000000
--- a/openedx/features/learner_profile/static/learner_profile/templates/badge_placeholder.underscore
+++ /dev/null
@@ -1,10 +0,0 @@
-<div class="badge-display badge-placeholder">
-  <div class="badge-image-container">
-    <span class="accomplishment-placeholder" aria-hidden="true">
-  </div>
-  <div class="badge-details">
-    <div class="badge-name"><%- gettext("What's Your Next Accomplishment?") %></div>
-    <p class="badge-description"><%- gettext('Start working toward your next learning goal.') %></p>
-    <a class="find-course" href="<%- find_courses_url %>"><span class="find-button-container"><%- gettext('Find a course') %></span></a>
-  </div>
-</div>
diff --git a/openedx/features/learner_profile/static/learner_profile/templates/share_modal.underscore b/openedx/features/learner_profile/static/learner_profile/templates/share_modal.underscore
deleted file mode 100644
index b71e89823bad..000000000000
--- a/openedx/features/learner_profile/static/learner_profile/templates/share_modal.underscore
+++ /dev/null
@@ -1,41 +0,0 @@
-<div class="focusguard focusguard-start" tabindex="0"></div>
-<div class="badges-modal" tabindex="0">
-        <button class="close"><span class="fa fa-close" aria-hidden="true"></span><span class="sr"><%- gettext("Close") %></span></button>
-    <h1 class="modal-header"><%- gettext("Share on Mozilla Backpack") %></h1>
-    <p class="explanation"><%- gettext("To share your certificate on Mozilla Backpack, you must first have a Backpack account. Complete the following steps to add your certificate to Backpack.") %>
-    </p>
-    <hr class="modal-hr"/>
-    <img class="backpack-logo" src="<%- badgeMeta.badges_logo %>" alt="">
-    <ol class="badges-steps">
-      <li class="step">
-        <%= edx.HtmlUtils.interpolateHtml(
-            gettext("Create a {link_start}Mozilla Backpack{link_end} account, or log in to your existing account"),
-            {
-              link_start: edx.HtmlUtils.HTML('<a href="https://backpack.openbadges.org/" rel="noopener" target="_blank">'),
-              link_end: edx.HtmlUtils.HTML('</a>')
-            }
-          )
-        %>
-      </li>
-
-      <li class="step">
-        <%= edx.HtmlUtils.interpolateHtml(
-            gettext("{download_link_start}Download this image (right-click or option-click, save as){link_end} and then {upload_link_start}upload{link_end} it to your backpack."),
-            {
-              download_link_start: edx.HtmlUtils.joinHtml(
-                edx.HtmlUtils.HTML('<a class="badge-link" href="'),
-                image_url,
-                edx.HtmlUtils.HTML('" rel="noopener" target="_blank">'),
-              ),
-              link_end: edx.HtmlUtils.HTML('</a>'),
-              upload_link_start: edx.HtmlUtils.HTML('<a href="https://backpack.openbadges.org/backpack/add" rel="noopener" target="_blank">')
-            }
-        )
-        %>
-      </li>
-    </ol>
-    <div class="image-container">
-        <img class="badges-backpack-example" src="<%- badgeMeta.backpack_ui_img %>" alt="">
-    </div>
-</div>
-<div class="focusguard focusguard-end" tabindex="0"></div>
\ No newline at end of file
diff --git a/openedx/features/learner_profile/views/learner_profile.py b/openedx/features/learner_profile/views/learner_profile.py
index e19e6853e8eb..6a3a251fde9a 100644
--- a/openedx/features/learner_profile/views/learner_profile.py
+++ b/openedx/features/learner_profile/views/learner_profile.py
@@ -11,7 +11,6 @@
 from django.views.decorators.http import require_http_methods
 from django_countries import countries
 
-from lms.djangoapps.badges.utils import badges_enabled
 from common.djangoapps.edxmako.shortcuts import marketing_link
 from openedx.core.djangoapps.credentials.utils import get_credentials_records_url
 from openedx.core.djangoapps.programs.models import ProgramsApiConfig
@@ -105,8 +104,6 @@ def learner_profile_context(request, profile_username, user_is_staff):
             'country_options': list(countries),
             'find_courses_url': marketing_link('COURSES'),
             'language_options': settings.ALL_LANGUAGES,
-            'badges_logo': staticfiles_storage.url('certificates/images/backpack-logo.png'),
-            'badges_icon': staticfiles_storage.url('certificates/images/ico-mozillaopenbadges.png'),
             'backpack_ui_img': staticfiles_storage.url('certificates/images/backpack-ui.png'),
             'platform_name': configuration_helpers.get_value('platform_name', settings.PLATFORM_NAME),
             'social_platforms': settings.SOCIAL_PLATFORMS,
@@ -128,7 +125,4 @@ def learner_profile_context(request, profile_username, user_is_staff):
         )
         context['achievements_fragment'] = achievements_fragment
 
-    if badges_enabled():
-        context['data']['badges_api_url'] = reverse("badges_api:user_assertions", kwargs={'username': profile_username})
-
     return context
diff --git a/openedx/testing/coverage_context_listener/pytest_plugin.py b/openedx/testing/coverage_context_listener/pytest_plugin.py
deleted file mode 100644
index cdafa7df8143..000000000000
--- a/openedx/testing/coverage_context_listener/pytest_plugin.py
+++ /dev/null
@@ -1,52 +0,0 @@
-"""
-A pytest plugin that reports test contexts to coverage running in another process.
-"""
-
-import pytest
-import requests
-
-from pavelib.utils.envs import Env
-
-
-class RemoteContextPlugin:
-    """
-    Pytest plugin for reporting pytests contexts to coverage running in another process
-    """
-    def __init__(self, config):
-        self.config = config
-        self.active = config.getoption("pytest-contexts")
-
-    def pytest_runtest_setup(self, item):
-        self.doit(item, "setup")
-
-    def pytest_runtest_teardown(self, item):
-        self.doit(item, "teardown")
-
-    def pytest_runtest_call(self, item):
-        self.doit(item, "call")
-
-    def doit(self, item, when):  # lint-amnesty, pylint: disable=missing-function-docstring
-        if self.active:
-            for cfg in Env.BOK_CHOY_SERVERS.values():
-                result = requests.post(
-                    'http://{host}:{port}/coverage_context/update_context'.format(**cfg),
-                    {
-                        'context': f"{item.nodeid}|{when}",
-                    }
-                )
-                assert result.status_code == 204
-
-
-@pytest.hookimpl(tryfirst=True)
-def pytest_configure(config):
-    config.pluginmanager.register(RemoteContextPlugin(config), "remotecontextplugin")
-
-
-def pytest_addoption(parser):
-    group = parser.getgroup("coverage")
-    group.addoption(
-        "--pytest-remote-contexts",
-        action="store_true",
-        dest="pytest-contexts",
-        help="Capture the pytest contexts that coverage is being captured in in another process",
-    )
diff --git a/openedx/tests/completion_integration/test_models.py b/openedx/tests/completion_integration/test_models.py
index 8871272b3cf0..e0aba950e859 100644
--- a/openedx/tests/completion_integration/test_models.py
+++ b/openedx/tests/completion_integration/test_models.py
@@ -62,7 +62,7 @@ def setUp(self):
         self.set_up_completion()
 
     def test_changed_value(self):
-        with self.assertNumQueries(SELECT + UPDATE + 2 * SAVEPOINT + 2 * OTHER):
+        with self.assertNumQueries(2 * SELECT + UPDATE + 2 * SAVEPOINT + 2 * OTHER):
             # OTHER = user exists, completion exists
             completion, isnew = models.BlockCompletion.objects.submit_completion(
                 user=self.user,
@@ -75,7 +75,7 @@ def test_changed_value(self):
         assert models.BlockCompletion.objects.count() == 1
 
     def test_unchanged_value(self):
-        with self.assertNumQueries(SELECT + 2 * SAVEPOINT):
+        with self.assertNumQueries(2 * SELECT + 2 * SAVEPOINT):
             completion, isnew = models.BlockCompletion.objects.submit_completion(
                 user=self.user,
                 block_key=self.block_key,
diff --git a/openedx/tests/xblock_integration/test_crowdsource_hinter.py b/openedx/tests/xblock_integration/test_crowdsource_hinter.py
index a2fffdc6e90c..61f1097481c7 100644
--- a/openedx/tests/xblock_integration/test_crowdsource_hinter.py
+++ b/openedx/tests/xblock_integration/test_crowdsource_hinter.py
@@ -21,8 +21,8 @@ class TestCrowdsourceHinter(SharedModuleStoreTestCase, LoginEnrollmentTestCase):
     Create the test environment with the crowdsourcehinter xblock.
     """
     STUDENTS = [
-        {'email': 'view@test.com', 'password': 'foo'},
-        {'email': 'view2@test.com', 'password': 'foo'}
+        {'email': 'view@test.com', 'password': SharedModuleStoreTestCase.TEST_PASSWORD},
+        {'email': 'view2@test.com', 'password': SharedModuleStoreTestCase.TEST_PASSWORD}
     ]
     XBLOCK_NAMES = ['crowdsourcehinter']
 
diff --git a/openedx/tests/xblock_integration/test_recommender.py b/openedx/tests/xblock_integration/test_recommender.py
index a494fc9c13c2..ae06b09db162 100644
--- a/openedx/tests/xblock_integration/test_recommender.py
+++ b/openedx/tests/xblock_integration/test_recommender.py
@@ -27,8 +27,8 @@ class TestRecommender(SharedModuleStoreTestCase, LoginEnrollmentTestCase):
     Check that Recommender state is saved properly
     """
     STUDENTS = [
-        {'email': 'view@test.com', 'password': 'foo'},
-        {'email': 'view2@test.com', 'password': 'foo'}
+        {'email': 'view@test.com', 'password': 'Password1234'},
+        {'email': 'view2@test.com', 'password': 'Password1234'}
     ]
     XBLOCK_NAMES = ['recommender', 'recommender_second']
 
@@ -141,7 +141,7 @@ def enroll_staff(self, staff):
         Staff login and enroll for the course
         """
         email = staff.email
-        password = 'test'
+        password = self.TEST_PASSWORD
         self.login(email, password)
         self.enroll(self.course, verify=True)
 
diff --git a/openedx/tests/xblock_integration/xblock_testcase.py b/openedx/tests/xblock_integration/xblock_testcase.py
index e75ca9a63d41..7e6d9a9387f9 100644
--- a/openedx/tests/xblock_integration/xblock_testcase.py
+++ b/openedx/tests/xblock_integration/xblock_testcase.py
@@ -71,7 +71,7 @@ class XBlockEventTestMixin:
     2. assert_event_published verifies that an event of a given search
         specification was published.
 
-    The Mongo/bok_choy event tests in cohorts have nice examplars for
+    The Mongo event tests in cohorts have nice examplars for
     how such functionality might look.
 
     In the future, we would like to expand both search
@@ -282,9 +282,9 @@ class XBlockStudentTestCaseMixin:
     Creates a default set of students for XBlock tests
     '''
     student_list = [
-        {'email': 'alice@test.edx.org', 'password': 'foo'},
-        {'email': 'bob@test.edx.org', 'password': 'foo'},
-        {'email': 'eve@test.edx.org', 'password': 'foo'},
+        {'email': 'alice@test.edx.org', 'password': 'Password1234'},
+        {'email': 'bob@test.edx.org', 'password': 'Password1234'},
+        {'email': 'eve@test.edx.org', 'password': 'Password1234'},
     ]
 
     def setUp(self):
diff --git a/pavelib/paver_tests/test_utils.py b/pavelib/paver_tests/test_utils.py
index 7a157b04ea2c..ff468ecc9b46 100644
--- a/pavelib/paver_tests/test_utils.py
+++ b/pavelib/paver_tests/test_utils.py
@@ -12,7 +12,6 @@
 from pavelib.utils.test.utils import MINIMUM_FIREFOX_VERSION, check_firefox_version
 
 
-@unittest.skipIf(Env.USING_DOCKER, 'Firefox version check works differently under Docker Devstack')
 class TestUtils(unittest.TestCase):
     """
     Test utils.py under pavelib/utils/test
diff --git a/pavelib/prereqs.py b/pavelib/prereqs.py
index a1b14c54455d..8d736edb8f9d 100644
--- a/pavelib/prereqs.py
+++ b/pavelib/prereqs.py
@@ -348,19 +348,8 @@ def install_prereqs():
         install_node_prereqs()
     install_python_prereqs()
     log_installed_python_prereqs()
-    print_devstack_warning()
 
 
 def log_installed_python_prereqs():
     """  Logs output of pip freeze for debugging. """
     sh("pip freeze > {}".format(Env.GEN_LOG_DIR + "/pip_freeze.log"))
-
-
-def print_devstack_warning():  # lint-amnesty, pylint: disable=missing-function-docstring
-    if Env.USING_DOCKER:  # pragma: no cover
-        print("********************************************************************************")
-        print("* WARNING: Mac users should run this from both the lms and studio shells")
-        print("* in docker devstack to avoid startup errors that kill your CPU.")
-        print("* For more details, see:")
-        print("* https://github.com/openedx/devstack#docker-is-using-lots-of-cpu-time-when-it-should-be-idle")
-        print("********************************************************************************")
diff --git a/pavelib/utils/envs.py b/pavelib/utils/envs.py
index 9e2e2fe5b831..ed2553a42fa2 100644
--- a/pavelib/utils/envs.py
+++ b/pavelib/utils/envs.py
@@ -61,18 +61,6 @@ class Env:
     # Python unittest dirs
     PYTHON_COVERAGERC = REPO_ROOT / ".coveragerc"
 
-    # Bok_choy dirs
-    BOK_CHOY_DIR = REPO_ROOT / "common" / "test" / "acceptance"
-    BOK_CHOY_LOG_DIR = GEN_LOG_DIR
-    BOK_CHOY_REPORT_DIR = REPORT_DIR / "bok_choy"
-    BOK_CHOY_A11Y_REPORT_DIR = REPORT_DIR / "a11y"
-    BOK_CHOY_COVERAGERC = BOK_CHOY_DIR / ".coveragerc"
-    BOK_CHOY_A11Y_COVERAGERC = BOK_CHOY_DIR / ".a11ycoveragerc"
-    BOK_CHOY_A11Y_CUSTOM_RULES_FILE = (
-        REPO_ROOT / "node_modules" / "edx-custom-a11y-rules" /
-        "lib" / "custom_a11y_rules.js"
-    )
-
     # Which Python version should be used in xdist workers?
     PYTHON_VERSION = os.environ.get("PYTHON_VERSION", "2.7")
 
@@ -82,94 +70,20 @@ class Env:
     # build steps. For local development/testing, this shouldn't be needed.
     if os.environ.get("SHARD", None):
         shard_str = "shard_{}".format(os.environ.get("SHARD"))
-        BOK_CHOY_REPORT_DIR = BOK_CHOY_REPORT_DIR / shard_str
-        BOK_CHOY_LOG_DIR = BOK_CHOY_LOG_DIR / shard_str
-
-    # The stubs package is currently located in the Django app called "terrain"
-    # from when they were used by both the bok-choy and lettuce (deprecated) acceptance tests
-    BOK_CHOY_STUB_DIR = REPO_ROOT / "common" / "djangoapps" / "terrain"
 
     # Directory that videos are served from
     VIDEO_SOURCE_DIR = REPO_ROOT / "test_root" / "data" / "video"
 
-    PRINT_SETTINGS_LOG_FILE = BOK_CHOY_LOG_DIR / "print_settings.log"
+    PRINT_SETTINGS_LOG_FILE = GEN_LOG_DIR / "print_settings.log"
 
     # Detect if in a Docker container, and if so which one
-    SERVER_HOST = os.environ.get('BOK_CHOY_HOSTNAME', '0.0.0.0')
-    USING_DOCKER = SERVER_HOST != '0.0.0.0'
-    SETTINGS = 'bok_choy_docker' if USING_DOCKER else 'bok_choy'
+    FRONTEND_TEST_SERVER_HOST = os.environ.get('FRONTEND_TEST_SERVER_HOSTNAME', '0.0.0.0')
+    USING_DOCKER = FRONTEND_TEST_SERVER_HOST != '0.0.0.0'
     DEVSTACK_SETTINGS = 'devstack_docker' if USING_DOCKER else 'devstack'
     TEST_SETTINGS = 'test'
 
-    BOK_CHOY_SERVERS = {
-        'lms': {
-            'host': SERVER_HOST,
-            'port': os.environ.get('BOK_CHOY_LMS_PORT', '8003'),
-            'log': BOK_CHOY_LOG_DIR / "bok_choy_lms.log"
-        },
-        'cms': {
-            'host': SERVER_HOST,
-            'port': os.environ.get('BOK_CHOY_CMS_PORT', '8031'),
-            'log': BOK_CHOY_LOG_DIR / "bok_choy_studio.log"
-        }
-    }
-
-    BOK_CHOY_STUBS = {
-
-        'xqueue': {
-            'port': 8040,
-            'log': BOK_CHOY_LOG_DIR / "bok_choy_xqueue.log",
-            'config': 'register_submission_url=http://0.0.0.0:8041/test/register_submission',
-        },
-
-        'ora': {
-            'port': 8041,
-            'log': BOK_CHOY_LOG_DIR / "bok_choy_ora.log",
-            'config': '',
-        },
-
-        'comments': {
-            'port': 4567,
-            'log': BOK_CHOY_LOG_DIR / "bok_choy_comments.log",
-        },
-
-        'video': {
-            'port': 8777,
-            'log': BOK_CHOY_LOG_DIR / "bok_choy_video_sources.log",
-            'config': f"root_dir={VIDEO_SOURCE_DIR}",
-        },
-
-        'youtube': {
-            'port': 9080,
-            'log': BOK_CHOY_LOG_DIR / "bok_choy_youtube.log",
-        },
-
-        'edxnotes': {
-            'port': 8042,
-            'log': BOK_CHOY_LOG_DIR / "bok_choy_edxnotes.log",
-        },
-
-        'ecommerce': {
-            'port': 8043,
-            'log': BOK_CHOY_LOG_DIR / "bok_choy_ecommerce.log",
-        },
-
-        'catalog': {
-            'port': 8091,
-            'log': BOK_CHOY_LOG_DIR / "bok_choy_catalog.log",
-        },
-
-        'lti': {
-            'port': 8765,
-            'log': BOK_CHOY_LOG_DIR / "bok_choy_lti.log",
-        },
-    }
-
     # Mongo databases that will be dropped before/after the tests run
-    MONGO_HOST = 'edx.devstack.mongo' if USING_DOCKER else 'localhost'
-    BOK_CHOY_MONGO_DATABASE = "test"
-    BOK_CHOY_CACHE_HOST = 'edx.devstack.memcached' if USING_DOCKER else '0.0.0.0'
-    BOK_CHOY_CACHE = memcache.Client([f'{BOK_CHOY_CACHE_HOST}:11211'], debug=0)
+    MONGO_HOST = 'localhost'
 
     # Test Ids Directory
     TEST_DIR = REPO_ROOT / ".testids"
diff --git a/requirements/common_constraints.txt b/requirements/common_constraints.txt
index d1be149855f8..36116b4817fb 100644
--- a/requirements/common_constraints.txt
+++ b/requirements/common_constraints.txt
@@ -25,6 +25,7 @@ elasticsearch<7.14.0
 
 # django-simple-history>3.0.0 adds indexing and causes a lot of migrations to be affected
 
-# tox>4.0.0 isn't yet compatible with many tox plugins, causing CI failures in almost all repos.
-# Details can be found in this discussion: https://github.com/tox-dev/tox/discussions/1810
-tox<4.0.0
+# virtualenv latest version requires platformdirs<4.0 which conflicts with tox>4.0 version
+# This constraint can be removed once the issue 
+# https://github.com/pypa/virtualenv/issues/2666 gets resolved 
+platformdirs<4.0
diff --git a/requirements/constraints.txt b/requirements/constraints.txt
index fa87aa538163..a4c05a6bdbff 100644
--- a/requirements/constraints.txt
+++ b/requirements/constraints.txt
@@ -26,7 +26,11 @@ django-storages==1.14
 # The team that owns this package will manually bump this package rather than having it pulled in automatically.
 # This is to allow them to better control its deployment and to do it in a process that works better
 # for them.
-edx-enterprise==4.6.1
+edx-enterprise==4.7.0
+
+# edx-drf-extensions 8.13.0 was causing errors, as mentioned in this revert PR:
+# https://github.com/openedx/edx-platform/pull/33682.
+edx-drf-extensions==8.12.0
 
 # django-oauth-toolkit version >=2.0.0 has breaking changes. More details
 # mentioned on this issue https://github.com/openedx/edx-platform/issues/32884
@@ -121,7 +125,7 @@ libsass==0.10.0
 click==8.1.6
 
 # pinning this version to avoid updates while the library is being developed
-openedx-learning==0.2.3
+openedx-learning==0.3.3
 
 # lti-consumer-xblock 9.6.2 contains a breaking change that makes
 # existing custom parameter configurations unusable.
diff --git a/requirements/edx-sandbox/py38.txt b/requirements/edx-sandbox/py38.txt
index c4674d259cd0..1a9040d8db12 100644
--- a/requirements/edx-sandbox/py38.txt
+++ b/requirements/edx-sandbox/py38.txt
@@ -22,9 +22,9 @@ cryptography==38.0.4
     #   -r requirements/edx-sandbox/py38.in
 cycler==0.12.1
     # via matplotlib
-fonttools==4.43.1
+fonttools==4.44.0
     # via matplotlib
-importlib-resources==6.1.0
+importlib-resources==6.1.1
     # via matplotlib
 joblib==1.3.2
     # via nltk
diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt
index f97965621b46..714952a1b573 100644
--- a/requirements/edx/base.txt
+++ b/requirements/edx/base.txt
@@ -9,21 +9,25 @@
 acid-xblock==0.2.1
     # via -r requirements/edx/kernel.in
 aiohttp==3.8.6
-    # via
-    #   geoip2
-    #   openai
+    # via geoip2
 aiosignal==1.3.1
     # via aiohttp
 algoliasearch==2.6.3
     # via
     #   -c requirements/edx/../constraints.txt
     #   -r requirements/edx/bundled.in
-amqp==5.1.1
+amqp==5.2.0
     # via kombu
 analytics-python==1.4.post1
     # via -r requirements/edx/kernel.in
 aniso8601==9.0.1
     # via edx-tincan-py35
+annotated-types==0.6.0
+    # via pydantic
+anyio==3.7.1
+    # via
+    #   httpx
+    #   openai
 appdirs==1.4.4
     # via fs
 asgiref==3.7.2
@@ -31,9 +35,7 @@ asgiref==3.7.2
     #   django
     #   django-countries
 asn1crypto==1.5.1
-    # via
-    #   oscrypto
-    #   snowflake-connector-python
+    # via snowflake-connector-python
 async-timeout==4.0.3
     # via
     #   aiohttp
@@ -64,7 +66,7 @@ backports-zoneinfo[tzdata]==0.2.1
     #   kombu
 beautifulsoup4==4.12.2
     # via pynliner
-billiard==4.1.0
+billiard==4.2.0
     # via celery
 bleach[css]==6.1.0
     # via
@@ -79,20 +81,20 @@ boto==2.39.0
     # via
     #   -c requirements/edx/../constraints.txt
     #   -r requirements/edx/kernel.in
-boto3==1.28.62
+boto3==1.28.83
     # via
     #   -r requirements/edx/kernel.in
     #   django-ses
     #   fs-s3fs
     #   ora2
-botocore==1.31.62
+botocore==1.31.83
     # via
     #   -r requirements/edx/kernel.in
     #   boto3
     #   s3transfer
 bridgekeeper==0.9
     # via -r requirements/edx/kernel.in
-celery==5.3.4
+celery==5.3.5
     # via
     #   -c requirements/edx/../constraints.txt
     #   -r requirements/edx/kernel.in
@@ -106,6 +108,8 @@ certifi==2023.7.22
     # via
     #   -r requirements/edx/paver.txt
     #   elasticsearch
+    #   httpcore
+    #   httpx
     #   py2neo
     #   requests
     #   snowflake-connector-python
@@ -169,7 +173,7 @@ cryptography==38.0.4
     #   pyopenssl
     #   snowflake-connector-python
     #   social-auth-core
-cssutils==2.7.1
+cssutils==2.9.0
     # via pynliner
 defusedxml==0.7.1
     # via
@@ -180,7 +184,9 @@ defusedxml==0.7.1
     #   social-auth-core
 deprecated==1.2.14
     # via jwcrypto
-django==3.2.22
+distro==1.8.0
+    # via openai
+django==3.2.23
     # via
     #   -c requirements/edx/../common_constraints.txt
     #   -r requirements/edx/kernel.in
@@ -265,7 +271,7 @@ django-config-models==2.5.1
     #   edx-enterprise
     #   edx-name-affirmation
     #   lti-consumer-xblock
-django-cors-headers==4.2.0
+django-cors-headers==4.3.0
     # via -r requirements/edx/kernel.in
 django-countries==7.5.1
     # via
@@ -290,7 +296,7 @@ django-filter==23.3
     #   edx-enterprise
     #   lti-consumer-xblock
     #   openedx-blockstore
-django-ipware==5.0.1
+django-ipware==5.0.2
     # via
     #   -r requirements/edx/kernel.in
     #   edx-enterprise
@@ -323,7 +329,7 @@ django-mptt==0.14.0
     #   openedx-django-wiki
 django-multi-email-field==0.7.0
     # via edx-enterprise
-django-mysql==4.11.0
+django-mysql==4.12.0
     # via -r requirements/edx/kernel.in
 django-oauth-toolkit==1.7.1
     # via
@@ -402,7 +408,7 @@ djangorestframework==3.14.0
     #   super-csv
 djangorestframework-xml==2.0.0
     # via edx-enterprise
-done-xblock==2.1.0
+done-xblock==2.2.0
     # via -r requirements/edx/bundled.in
 drf-jwt==1.19.2
     # via edx-drf-extensions
@@ -445,16 +451,16 @@ edx-celeryutils==1.2.3
     #   super-csv
 edx-codejail==3.3.3
     # via -r requirements/edx/kernel.in
-edx-completion==4.3.0
+edx-completion==4.4.0
     # via -r requirements/edx/kernel.in
 edx-django-release-util==1.3.0
     # via
     #   -r requirements/edx/kernel.in
     #   edxval
     #   openedx-blockstore
-edx-django-sites-extensions==4.0.1
+edx-django-sites-extensions==4.0.2
     # via -r requirements/edx/kernel.in
-edx-django-utils==5.7.0
+edx-django-utils==5.8.0
     # via
     #   -r requirements/edx/kernel.in
     #   django-config-models
@@ -470,8 +476,9 @@ edx-django-utils==5.7.0
     #   openedx-blockstore
     #   ora2
     #   super-csv
-edx-drf-extensions==8.11.0
+edx-drf-extensions==8.12.0
     # via
+    #   -c requirements/edx/../constraints.txt
     #   -r requirements/edx/kernel.in
     #   edx-completion
     #   edx-enterprise
@@ -482,7 +489,7 @@ edx-drf-extensions==8.11.0
     #   edx-when
     #   edxval
     #   openedx-learning
-edx-enterprise==4.6.1
+edx-enterprise==4.7.0
     # via
     #   -c requirements/edx/../constraints.txt
     #   -r requirements/edx/kernel.in
@@ -520,7 +527,7 @@ edx-proctoring==4.16.1
     #   edx-proctoring-proctortrack
 edx-rbac==1.8.0
     # via edx-enterprise
-edx-rest-api-client==5.6.0
+edx-rest-api-client==5.6.1
     # via
     #   -r requirements/edx/kernel.in
     #   edx-enterprise
@@ -565,11 +572,14 @@ enmerkar-underscore==2.2.0
 event-tracking==2.2.0
     # via
     #   -r requirements/edx/kernel.in
+    #   edx-completion
     #   edx-proctoring
     #   edx-search
-fastavro==1.8.4
+exceptiongroup==1.1.3
+    # via anyio
+fastavro==1.9.0
     # via openedx-events
-filelock==3.12.4
+filelock==3.13.1
     # via snowflake-connector-python
 frozenlist==1.4.0
     # via
@@ -593,24 +603,32 @@ glob2==0.7
     # via -r requirements/edx/kernel.in
 gunicorn==21.2.0
     # via -r requirements/edx/kernel.in
+h11==0.14.0
+    # via httpcore
 help-tokens==2.3.0
     # via -r requirements/edx/kernel.in
 html5lib==1.1
     # via
     #   -r requirements/edx/kernel.in
     #   ora2
-icalendar==5.0.10
+httpcore==1.0.2
+    # via httpx
+httpx==0.25.1
+    # via openai
+icalendar==5.0.11
     # via -r requirements/edx/kernel.in
 idna==3.4
     # via
     #   -r requirements/edx/paver.txt
+    #   anyio
+    #   httpx
     #   optimizely-sdk
     #   requests
     #   snowflake-connector-python
     #   yarl
 importlib-metadata==6.8.0
     # via markdown
-importlib-resources==6.1.0
+importlib-resources==6.1.1
     # via
     #   jsonschema
     #   jsonschema-specifications
@@ -647,7 +665,7 @@ jsonfield==3.1.0
     #   edx-submissions
     #   lti-consumer-xblock
     #   ora2
-jsonschema==4.19.1
+jsonschema==4.19.2
     # via
     #   drf-spectacular
     #   optimizely-sdk
@@ -657,7 +675,7 @@ jwcrypto==1.5.0
     # via
     #   django-oauth-toolkit
     #   pylti1p3
-kombu==5.3.2
+kombu==5.3.3
     # via celery
 laboratory==1.0.2
     # via -r requirements/edx/kernel.in
@@ -692,7 +710,7 @@ lxml==4.9.3
     #   xmlsec
 mailsnake==1.6.4
     # via -r requirements/edx/bundled.in
-mako==1.2.4
+mako==1.3.0
     # via
     #   -r requirements/edx/kernel.in
     #   acid-xblock
@@ -717,7 +735,7 @@ markupsafe==2.1.3
     #   mako
     #   openedx-calc
     #   xblock
-maxminddb==2.4.0
+maxminddb==2.5.1
     # via geoip2
 mock==5.1.0
     # via -r requirements/edx/paver.txt
@@ -737,7 +755,7 @@ mysqlclient==2.2.0
     # via
     #   -r requirements/edx/kernel.in
     #   openedx-blockstore
-newrelic==9.1.0
+newrelic==9.1.1
     # via
     #   -r requirements/edx/bundled.in
     #   edx-django-utils
@@ -760,7 +778,7 @@ oauthlib==3.2.2
     #   social-auth-core
 olxcleaner==0.2.1
     # via -r requirements/edx/kernel.in
-openai==0.28.1
+openai==1.2.2
     # via edx-enterprise
 openedx-atlas==0.5.0
     # via -r requirements/edx/kernel.in
@@ -776,7 +794,7 @@ openedx-django-require==2.1.0
     # via -r requirements/edx/kernel.in
 openedx-django-wiki==2.0.3
     # via -r requirements/edx/kernel.in
-openedx-events==9.0.0
+openedx-events==9.0.1
     # via
     #   -r requirements/edx/kernel.in
     #   edx-event-bus-kafka
@@ -785,7 +803,7 @@ openedx-filters==1.6.0
     # via
     #   -r requirements/edx/kernel.in
     #   lti-consumer-xblock
-openedx-learning==0.2.3
+openedx-learning==0.3.3
     # via
     #   -c requirements/edx/../constraints.txt
     #   -r requirements/edx/kernel.in
@@ -793,10 +811,8 @@ openedx-mongodbproxy==0.2.0
     # via -r requirements/edx/kernel.in
 optimizely-sdk==4.1.1
     # via -r requirements/edx/bundled.in
-ora2==5.5.4
+ora2==6.0.2
     # via -r requirements/edx/bundled.in
-oscrypto==1.3.0
-    # via snowflake-connector-python
 packaging==23.2
     # via
     #   drf-yasg
@@ -818,7 +834,7 @@ path-py==12.5.0
     #   staff-graded-xblock
 paver==1.3.4
     # via -r requirements/edx/paver.txt
-pbr==5.11.1
+pbr==6.0.0
     # via
     #   -r requirements/edx/paver.txt
     #   stevedore
@@ -836,12 +852,14 @@ pillow==9.5.0
 pkgutil-resolve-name==1.3.10
     # via jsonschema
 platformdirs==3.11.0
-    # via snowflake-connector-python
+    # via
+    #   -c requirements/edx/../common_constraints.txt
+    #   snowflake-connector-python
 polib==1.2.0
     # via edx-i18n-tools
-prompt-toolkit==3.0.39
+prompt-toolkit==3.0.40
     # via click-repl
-psutil==5.9.5
+psutil==5.9.6
     # via
     #   -r requirements/edx/paver.txt
     #   edx-django-utils
@@ -861,7 +879,10 @@ pycryptodomex==3.19.0
     #   edx-proctoring
     #   lti-consumer-xblock
     #   pyjwkest
-    #   snowflake-connector-python
+pydantic==2.4.2
+    # via openai
+pydantic-core==2.10.1
+    # via pydantic
 pygments==2.16.1
     # via
     #   -r requirements/edx/bundled.in
@@ -910,7 +931,7 @@ pyparsing==3.1.1
     # via
     #   chem
     #   openedx-calc
-pyrsistent==0.19.3
+pyrsistent==0.20.0
     # via optimizely-sdk
 pysrt==1.1.2
     # via
@@ -1001,7 +1022,6 @@ requests==2.31.0
     #   edx-rest-api-client
     #   geoip2
     #   mailsnake
-    #   openai
     #   optimizely-sdk
     #   pyjwkest
     #   pylti1p3
@@ -1015,11 +1035,11 @@ requests-oauthlib==1.3.1
     # via
     #   -r requirements/edx/kernel.in
     #   social-auth-core
-rpds-py==0.10.4
+rpds-py==0.12.0
     # via
     #   jsonschema
     #   referencing
-ruamel-yaml==0.17.35
+ruamel-yaml==0.18.5
     # via drf-yasg
 ruamel-yaml-clib==0.2.8
     # via ruamel-yaml
@@ -1040,7 +1060,7 @@ scipy==1.7.3
     #   openedx-calc
 semantic-version==2.10.0
     # via edx-drf-extensions
-shapely==2.0.1
+shapely==2.0.2
     # via -r requirements/edx/kernel.in
 simplejson==3.19.2
     # via
@@ -1084,7 +1104,11 @@ slumber==0.7.1
     #   edx-bulk-grades
     #   edx-enterprise
     #   edx-rest-api-client
-snowflake-connector-python==3.2.1
+sniffio==1.3.0
+    # via
+    #   anyio
+    #   httpx
+snowflake-connector-python==3.4.1
     # via edx-enterprise
 social-auth-app-django==5.0.0
     # via
@@ -1112,7 +1136,7 @@ sqlparse==0.4.4
     #   -r requirements/edx/kernel.in
     #   django
     #   openedx-blockstore
-staff-graded-xblock==2.1.1
+staff-graded-xblock==2.2.0
     # via -r requirements/edx/bundled.in
 stevedore==5.1.0
     # via
@@ -1127,13 +1151,13 @@ super-csv==3.1.0
     # via edx-bulk-grades
 sympy==1.12
     # via openedx-calc
-testfixtures==7.2.0
+testfixtures==7.2.2
     # via edx-enterprise
 text-unidecode==1.3
     # via python-slugify
 tinycss2==1.2.1
     # via bleach
-tomlkit==0.12.1
+tomlkit==0.12.2
     # via snowflake-connector-python
 tqdm==4.66.1
     # via
@@ -1142,10 +1166,14 @@ tqdm==4.66.1
 typing-extensions==4.8.0
     # via
     #   -r requirements/edx/paver.txt
+    #   annotated-types
     #   asgiref
     #   django-countries
     #   edx-opaque-keys
     #   kombu
+    #   openai
+    #   pydantic
+    #   pydantic-core
     #   pylti1p3
     #   snowflake-connector-python
 tzdata==2023.3
@@ -1161,7 +1189,7 @@ uritemplate==4.1.1
     #   coreapi
     #   drf-spectacular
     #   drf-yasg
-urllib3==1.26.17
+urllib3==1.26.18
     # via
     #   -c requirements/edx/../constraints.txt
     #   -r requirements/edx/paver.txt
@@ -1172,7 +1200,7 @@ urllib3==1.26.17
     #   snowflake-connector-python
 user-util==1.0.0
     # via -r requirements/edx/kernel.in
-vine==5.0.0
+vine==5.1.0
     # via
     #   amqp
     #   celery
@@ -1183,7 +1211,7 @@ walrus==0.9.3
     # via edx-event-bus-redis
 watchdog==3.0.0
     # via -r requirements/edx/paver.txt
-wcwidth==0.2.8
+wcwidth==0.2.9
     # via prompt-toolkit
 web-fragments==2.1.0
     # via
@@ -1202,7 +1230,7 @@ webob==1.8.7
     # via
     #   -r requirements/edx/kernel.in
     #   xblock
-wrapt==1.15.0
+wrapt==1.16.0
     # via
     #   -r requirements/edx/paver.txt
     #   deprecated
@@ -1218,23 +1246,20 @@ xblock[django]==1.8.1
     #   lti-consumer-xblock
     #   ora2
     #   staff-graded-xblock
+    #   xblock-drag-and-drop-v2
     #   xblock-google-drive
     #   xblock-poll
     #   xblock-utils
-xblock-drag-and-drop-v2==3.2.0
+xblock-drag-and-drop-v2==3.3.0
     # via -r requirements/edx/bundled.in
-xblock-google-drive==0.4.0
+xblock-google-drive==0.5.0
     # via -r requirements/edx/bundled.in
 xblock-poll==1.13.0
     # via -r requirements/edx/bundled.in
 xblock-utils==4.0.0
     # via
-    #   -r requirements/edx/kernel.in
-    #   done-xblock
     #   edx-sga
     #   lti-consumer-xblock
-    #   staff-graded-xblock
-    #   xblock-drag-and-drop-v2
     #   xblock-google-drive
 xmlsec==1.3.13
     # via python3-saml
diff --git a/requirements/edx/coverage.txt b/requirements/edx/coverage.txt
index 93af4c1f8247..65c0f4525397 100644
--- a/requirements/edx/coverage.txt
+++ b/requirements/edx/coverage.txt
@@ -8,7 +8,7 @@ chardet==5.2.0
     # via diff-cover
 coverage==7.3.2
     # via -r requirements/edx/coverage.in
-diff-cover==7.7.0
+diff-cover==8.0.0
     # via -r requirements/edx/coverage.in
 jinja2==3.1.2
     # via diff-cover
diff --git a/requirements/edx/development.txt b/requirements/edx/development.txt
index 2d833cca7816..f94fd4b028cb 100644
--- a/requirements/edx/development.txt
+++ b/requirements/edx/development.txt
@@ -21,7 +21,6 @@ aiohttp==3.8.6
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
     #   geoip2
-    #   openai
 aiosignal==1.3.1
     # via
     #   -r requirements/edx/doc.txt
@@ -36,7 +35,7 @@ algoliasearch==2.6.3
     #   -c requirements/edx/../constraints.txt
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
-amqp==5.1.1
+amqp==5.2.0
     # via
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
@@ -52,13 +51,16 @@ aniso8601==9.0.1
     #   edx-tincan-py35
 annotated-types==0.6.0
     # via
+    #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
     #   pydantic
 anyio==3.7.1
     # via
+    #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
     #   fastapi
-    #   httpcore
+    #   httpx
+    #   openai
     #   starlette
 appdirs==1.4.4
     # via
@@ -75,7 +77,6 @@ asn1crypto==1.5.1
     # via
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
-    #   oscrypto
     #   snowflake-connector-python
 astroid==2.13.5
     # via
@@ -118,6 +119,7 @@ backports-zoneinfo[tzdata]==0.2.1
     # via
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
+    #   backports-zoneinfo
     #   celery
     #   icalendar
     #   kombu
@@ -127,7 +129,7 @@ beautifulsoup4==4.12.2
     #   -r requirements/edx/testing.txt
     #   pydata-sphinx-theme
     #   pynliner
-billiard==4.1.0
+billiard==4.2.0
     # via
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
@@ -136,27 +138,26 @@ bleach[css]==6.1.0
     # via
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
+    #   bleach
     #   edx-enterprise
     #   lti-consumer-xblock
     #   openedx-django-wiki
     #   ora2
     #   xblock-drag-and-drop-v2
     #   xblock-poll
-bok-choy==2.0.2
-    # via -r requirements/edx/testing.txt
 boto==2.39.0
     # via
     #   -c requirements/edx/../constraints.txt
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
-boto3==1.28.62
+boto3==1.28.83
     # via
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
     #   django-ses
     #   fs-s3fs
     #   ora2
-botocore==1.31.62
+botocore==1.31.83
     # via
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
@@ -170,7 +171,7 @@ build==1.0.3
     # via
     #   -r requirements/edx/../pip-tools.txt
     #   pip-tools
-celery==5.3.4
+celery==5.3.5
     # via
     #   -c requirements/edx/../constraints.txt
     #   -r requirements/edx/doc.txt
@@ -282,6 +283,7 @@ coreschema==0.0.4
 coverage[toml]==7.3.2
     # via
     #   -r requirements/edx/testing.txt
+    #   coverage
     #   pytest-cov
 crowdsourcehinter-xblock==0.6
     # via
@@ -305,12 +307,12 @@ cssselect==1.2.0
     # via
     #   -r requirements/edx/testing.txt
     #   pyquery
-cssutils==2.7.1
+cssutils==2.9.0
     # via
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
     #   pynliner
-ddt==1.6.0
+ddt==1.7.0
     # via -r requirements/edx/testing.txt
 deepmerge==1.1.0
     # via
@@ -329,7 +331,7 @@ deprecated==1.2.14
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
     #   jwcrypto
-diff-cover==7.7.0
+diff-cover==8.0.0
     # via -r requirements/edx/testing.txt
 dill==0.3.7
     # via
@@ -339,7 +341,12 @@ distlib==0.3.7
     # via
     #   -r requirements/edx/testing.txt
     #   virtualenv
-django==3.2.22
+distro==1.8.0
+    # via
+    #   -r requirements/edx/doc.txt
+    #   -r requirements/edx/testing.txt
+    #   openai
+django==3.2.23
     # via
     #   -c requirements/edx/../common_constraints.txt
     #   -r requirements/edx/doc.txt
@@ -440,7 +447,7 @@ django-config-models==2.5.1
     #   edx-enterprise
     #   edx-name-affirmation
     #   lti-consumer-xblock
-django-cors-headers==4.2.0
+django-cors-headers==4.3.0
     # via
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
@@ -478,7 +485,7 @@ django-filter==23.3
     #   edx-enterprise
     #   lti-consumer-xblock
     #   openedx-blockstore
-django-ipware==5.0.1
+django-ipware==5.0.2
     # via
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
@@ -522,7 +529,7 @@ django-multi-email-field==0.7.0
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
     #   edx-enterprise
-django-mysql==4.11.0
+django-mysql==4.12.0
     # via
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
@@ -584,7 +591,7 @@ django-stubs==1.16.0
     #   -c requirements/edx/../constraints.txt
     #   -r requirements/edx/development.in
     #   djangorestframework-stubs
-django-stubs-ext==4.2.2
+django-stubs-ext==4.2.5
     # via django-stubs
 django-user-tasks==3.1.0
     # via
@@ -645,7 +652,7 @@ docutils==0.19
     #   pydata-sphinx-theme
     #   sphinx
     #   sphinx-mdinclude
-done-xblock==2.1.0
+done-xblock==2.2.0
     # via
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
@@ -710,7 +717,7 @@ edx-codejail==3.3.3
     # via
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
-edx-completion==4.3.0
+edx-completion==4.4.0
     # via
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
@@ -720,11 +727,11 @@ edx-django-release-util==1.3.0
     #   -r requirements/edx/testing.txt
     #   edxval
     #   openedx-blockstore
-edx-django-sites-extensions==4.0.1
+edx-django-sites-extensions==4.0.2
     # via
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
-edx-django-utils==5.7.0
+edx-django-utils==5.8.0
     # via
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
@@ -741,8 +748,9 @@ edx-django-utils==5.7.0
     #   openedx-blockstore
     #   ora2
     #   super-csv
-edx-drf-extensions==8.11.0
+edx-drf-extensions==8.12.0
     # via
+    #   -c requirements/edx/../constraints.txt
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
     #   edx-completion
@@ -754,7 +762,7 @@ edx-drf-extensions==8.11.0
     #   edx-when
     #   edxval
     #   openedx-learning
-edx-enterprise==4.6.1
+edx-enterprise==4.7.0
     # via
     #   -c requirements/edx/../constraints.txt
     #   -r requirements/edx/doc.txt
@@ -772,7 +780,7 @@ edx-i18n-tools==1.3.0
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
     #   ora2
-edx-lint==5.3.4
+edx-lint==5.3.6
     # via -r requirements/edx/testing.txt
 edx-milestones==0.5.0
     # via
@@ -792,6 +800,7 @@ edx-opaque-keys[django]==2.5.1
     #   edx-drf-extensions
     #   edx-enterprise
     #   edx-milestones
+    #   edx-opaque-keys
     #   edx-organizations
     #   edx-proctoring
     #   edx-when
@@ -812,7 +821,7 @@ edx-rbac==1.8.0
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
     #   edx-enterprise
-edx-rest-api-client==5.6.0
+edx-rest-api-client==5.6.1
     # via
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
@@ -880,10 +889,12 @@ event-tracking==2.2.0
     # via
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
+    #   edx-completion
     #   edx-proctoring
     #   edx-search
 exceptiongroup==1.1.3
     # via
+    #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
     #   anyio
     #   pytest
@@ -893,20 +904,20 @@ execnet==2.0.2
     #   pytest-xdist
 factory-boy==3.3.0
     # via -r requirements/edx/testing.txt
-faker==19.8.0
+faker==19.13.0
     # via
     #   -r requirements/edx/testing.txt
     #   factory-boy
-fastapi==0.103.2
+fastapi==0.104.1
     # via
     #   -r requirements/edx/testing.txt
     #   pact-python
-fastavro==1.8.4
+fastavro==1.9.0
     # via
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
     #   openedx-events
-filelock==3.12.4
+filelock==3.13.1
     # via
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
@@ -942,17 +953,17 @@ geoip2==4.7.0
     # via
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
-gitdb==4.0.10
+gitdb==4.0.11
     # via
     #   -r requirements/edx/doc.txt
     #   gitpython
-gitpython==3.1.37
+gitpython==3.1.40
     # via -r requirements/edx/doc.txt
 glob2==0.7
     # via
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
-grimp==3.0
+grimp==3.1
     # via
     #   -r requirements/edx/testing.txt
     #   import-linter
@@ -962,6 +973,7 @@ gunicorn==21.2.0
     #   -r requirements/edx/testing.txt
 h11==0.14.0
     # via
+    #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
     #   httpcore
     #   uvicorn
@@ -974,17 +986,19 @@ html5lib==1.1
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
     #   ora2
-httpcore==0.16.3
+httpcore==1.0.2
     # via
+    #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
     #   httpx
 httpretty==1.1.4
     # via -r requirements/edx/testing.txt
-httpx==0.23.3
+httpx==0.25.1
     # via
+    #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
-    #   pact-python
-icalendar==5.0.10
+    #   openai
+icalendar==5.0.11
     # via
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
@@ -993,16 +1007,16 @@ idna==3.4
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
     #   anyio
+    #   httpx
     #   optimizely-sdk
     #   requests
-    #   rfc3986
     #   snowflake-connector-python
     #   yarl
 imagesize==1.4.1
     # via
     #   -r requirements/edx/doc.txt
     #   sphinx
-import-linter==1.12.0
+import-linter==1.12.1
     # via -r requirements/edx/testing.txt
 importlib-metadata==6.8.0
     # via
@@ -1013,7 +1027,7 @@ importlib-metadata==6.8.0
     #   markdown
     #   pytest-randomly
     #   sphinx
-importlib-resources==6.1.0
+importlib-resources==6.1.1
     # via
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
@@ -1086,7 +1100,7 @@ jsonfield==3.1.0
     #   edx-submissions
     #   lti-consumer-xblock
     #   ora2
-jsonschema==4.19.1
+jsonschema==4.19.2
     # via
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
@@ -1104,7 +1118,7 @@ jwcrypto==1.5.0
     #   -r requirements/edx/testing.txt
     #   django-oauth-toolkit
     #   pylti1p3
-kombu==5.3.2
+kombu==5.3.3
     # via
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
@@ -1118,7 +1132,6 @@ lazy==1.6
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
     #   acid-xblock
-    #   bok-choy
     #   lti-consumer-xblock
     #   ora2
     #   xblock
@@ -1160,7 +1173,7 @@ mailsnake==1.6.4
     # via
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
-mako==1.2.4
+mako==1.3.0
     # via
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
@@ -1191,7 +1204,7 @@ markupsafe==2.1.3
     #   mako
     #   openedx-calc
     #   xblock
-maxminddb==2.4.0
+maxminddb==2.5.1
     # via
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
@@ -1229,7 +1242,7 @@ multidict==6.0.4
     #   -r requirements/edx/testing.txt
     #   aiohttp
     #   yarl
-mypy==1.5.1
+mypy==1.7.0
     # via
     #   -r requirements/edx/development.in
     #   django-stubs
@@ -1241,7 +1254,7 @@ mysqlclient==2.2.0
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
     #   openedx-blockstore
-newrelic==9.1.0
+newrelic==9.1.1
     # via
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
@@ -1276,7 +1289,7 @@ olxcleaner==0.2.1
     # via
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
-openai==0.28.1
+openai==1.2.2
     # via
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
@@ -1307,7 +1320,7 @@ openedx-django-wiki==2.0.3
     # via
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
-openedx-events==9.0.0
+openedx-events==9.0.1
     # via
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
@@ -1318,7 +1331,7 @@ openedx-filters==1.6.0
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
     #   lti-consumer-xblock
-openedx-learning==0.2.3
+openedx-learning==0.3.3
     # via
     #   -c requirements/edx/../constraints.txt
     #   -r requirements/edx/doc.txt
@@ -1331,15 +1344,10 @@ optimizely-sdk==4.1.1
     # via
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
-ora2==5.5.4
-    # via
-    #   -r requirements/edx/doc.txt
-    #   -r requirements/edx/testing.txt
-oscrypto==1.3.0
+ora2==6.0.2
     # via
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
-    #   snowflake-connector-python
 packaging==23.2
     # via
     #   -r requirements/edx/../pip-tools.txt
@@ -1354,7 +1362,7 @@ packaging==23.2
     #   snowflake-connector-python
     #   sphinx
     #   tox
-pact-python==2.0.1
+pact-python==2.1.1
     # via -r requirements/edx/testing.txt
 pansi==2020.7.3
     # via
@@ -1378,7 +1386,7 @@ paver==1.3.4
     # via
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
-pbr==5.11.1
+pbr==6.0.0
     # via
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
@@ -1413,6 +1421,7 @@ pkgutil-resolve-name==1.3.10
     #   jsonschema
 platformdirs==3.11.0
     # via
+    #   -c requirements/edx/../common_constraints.txt
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
     #   pylint
@@ -1429,12 +1438,12 @@ polib==1.2.0
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
     #   edx-i18n-tools
-prompt-toolkit==3.0.39
+prompt-toolkit==3.0.40
     # via
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
     #   click-repl
-psutil==5.9.5
+psutil==5.9.6
     # via
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
@@ -1475,16 +1484,18 @@ pycryptodomex==3.19.0
     #   edx-proctoring
     #   lti-consumer-xblock
     #   pyjwkest
-    #   snowflake-connector-python
 pydantic==2.4.2
     # via
+    #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
     #   fastapi
+    #   openai
 pydantic-core==2.10.1
     # via
+    #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
     #   pydantic
-pydata-sphinx-theme==0.14.1
+pydata-sphinx-theme==0.14.3
     # via
     #   -r requirements/edx/doc.txt
     #   sphinx-book-theme
@@ -1513,6 +1524,7 @@ pyjwt[crypto]==2.8.0
     #   edx-drf-extensions
     #   edx-proctoring
     #   edx-rest-api-client
+    #   pyjwt
     #   pylti1p3
     #   snowflake-connector-python
     #   social-auth-core
@@ -1534,7 +1546,7 @@ pylint-celery==0.3
     # via
     #   -r requirements/edx/testing.txt
     #   edx-lint
-pylint-django==2.5.3
+pylint-django==2.5.5
     # via
     #   -r requirements/edx/testing.txt
     #   edx-lint
@@ -1590,7 +1602,7 @@ pyproject-hooks==1.0.0
     #   build
 pyquery==2.0.0
     # via -r requirements/edx/testing.txt
-pyrsistent==0.19.3
+pyrsistent==0.20.0
     # via
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
@@ -1600,7 +1612,7 @@ pysrt==1.1.2
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
     #   edxval
-pytest==7.4.2
+pytest==7.4.3
     # via
     #   -r requirements/edx/testing.txt
     #   pylint-pytest
@@ -1615,7 +1627,7 @@ pytest-attrib==0.1.3
     # via -r requirements/edx/testing.txt
 pytest-cov==4.1.0
     # via -r requirements/edx/testing.txt
-pytest-django==4.5.2
+pytest-django==4.7.0
     # via -r requirements/edx/testing.txt
 pytest-json-report==1.5.0
     # via -r requirements/edx/testing.txt
@@ -1626,7 +1638,9 @@ pytest-metadata==1.8.0
 pytest-randomly==3.15.0
     # via -r requirements/edx/testing.txt
 pytest-xdist[psutil]==3.3.1
-    # via -r requirements/edx/testing.txt
+    # via
+    #   -r requirements/edx/testing.txt
+    #   pytest-xdist
 python-dateutil==2.8.2
     # via
     #   -r requirements/edx/doc.txt
@@ -1745,7 +1759,6 @@ requests==2.31.0
     #   edx-rest-api-client
     #   geoip2
     #   mailsnake
-    #   openai
     #   optimizely-sdk
     #   pact-python
     #   pyjwkest
@@ -1762,17 +1775,13 @@ requests-oauthlib==1.3.1
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
     #   social-auth-core
-rfc3986[idna2008]==1.5.0
-    # via
-    #   -r requirements/edx/testing.txt
-    #   httpx
-rpds-py==0.10.4
+rpds-py==0.12.0
     # via
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
     #   jsonschema
     #   referencing
-ruamel-yaml==0.17.35
+ruamel-yaml==0.18.5
     # via
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
@@ -1806,16 +1815,12 @@ scipy==1.7.3
     #   -r requirements/edx/testing.txt
     #   chem
     #   openedx-calc
-selenium==3.141.0
-    # via
-    #   -r requirements/edx/testing.txt
-    #   bok-choy
 semantic-version==2.10.0
     # via
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
     #   edx-drf-extensions
-shapely==2.0.1
+shapely==2.0.2
     # via
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
@@ -1877,15 +1882,15 @@ smmap==5.0.1
     #   gitdb
 sniffio==1.3.0
     # via
+    #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
     #   anyio
-    #   httpcore
     #   httpx
 snowballstemmer==2.2.0
     # via
     #   -r requirements/edx/doc.txt
     #   sphinx
-snowflake-connector-python==3.2.1
+snowflake-connector-python==3.4.1
     # via
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
@@ -1936,7 +1941,7 @@ sphinx-mdinclude==0.5.3
     # via
     #   -r requirements/edx/doc.txt
     #   sphinxcontrib-openapi
-sphinx-reredirects==0.1.2
+sphinx-reredirects==0.1.3
     # via -r requirements/edx/doc.txt
 sphinxcontrib-applehelp==1.0.4
     # via
@@ -1958,8 +1963,10 @@ sphinxcontrib-jsmath==1.0.1
     # via
     #   -r requirements/edx/doc.txt
     #   sphinx
-sphinxcontrib-openapi[markdown]==0.8.1
-    # via -r requirements/edx/doc.txt
+sphinxcontrib-openapi[markdown]==0.8.3
+    # via
+    #   -r requirements/edx/doc.txt
+    #   sphinxcontrib-openapi
 sphinxcontrib-qthelp==1.0.3
     # via
     #   -r requirements/edx/doc.txt
@@ -1977,7 +1984,7 @@ sqlparse==0.4.4
     #   django
     #   django-debug-toolbar
     #   openedx-blockstore
-staff-graded-xblock==2.1.1
+staff-graded-xblock==2.2.0
     # via
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
@@ -2004,7 +2011,7 @@ sympy==1.12
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
     #   openedx-calc
-testfixtures==7.2.0
+testfixtures==7.2.2
     # via
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
@@ -2035,18 +2042,13 @@ tomli==2.0.1
     #   pyproject-hooks
     #   pytest
     #   tox
-tomlkit==0.12.1
+tomlkit==0.12.2
     # via
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
     #   pylint
     #   snowflake-connector-python
 tox==3.28.0
-    # via
-    #   -c requirements/edx/../common_constraints.txt
-    #   -r requirements/edx/testing.txt
-    #   tox-battery
-tox-battery==0.6.2
     # via -r requirements/edx/testing.txt
 tqdm==4.66.1
     # via
@@ -2082,6 +2084,7 @@ typing-extensions==4.8.0
     #   import-linter
     #   kombu
     #   mypy
+    #   openai
     #   pydantic
     #   pydantic-core
     #   pydata-sphinx-theme
@@ -2110,34 +2113,32 @@ uritemplate==4.1.1
     #   coreapi
     #   drf-spectacular
     #   drf-yasg
-urllib3==1.26.17
+urllib3==1.26.18
     # via
     #   -c requirements/edx/../constraints.txt
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
     #   botocore
     #   elasticsearch
-    #   pact-python
     #   py2neo
     #   requests
-    #   selenium
     #   snowflake-connector-python
 user-util==1.0.0
     # via
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
-uvicorn==0.23.2
+uvicorn==0.24.0.post1
     # via
     #   -r requirements/edx/testing.txt
     #   pact-python
-vine==5.0.0
+vine==5.1.0
     # via
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
     #   amqp
     #   celery
     #   kombu
-virtualenv==20.24.5
+virtualenv==20.24.6
     # via
     #   -r requirements/edx/testing.txt
     #   tox
@@ -2158,7 +2159,7 @@ watchdog==3.0.0
     #   -r requirements/edx/development.in
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
-wcwidth==0.2.8
+wcwidth==0.2.9
     # via
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
@@ -2184,11 +2185,11 @@ webob==1.8.7
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
     #   xblock
-wheel==0.41.2
+wheel==0.41.3
     # via
     #   -r requirements/edx/../pip-tools.txt
     #   pip-tools
-wrapt==1.15.0
+wrapt==1.16.0
     # via
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
@@ -2207,14 +2208,16 @@ xblock[django]==1.8.1
     #   lti-consumer-xblock
     #   ora2
     #   staff-graded-xblock
+    #   xblock
+    #   xblock-drag-and-drop-v2
     #   xblock-google-drive
     #   xblock-poll
     #   xblock-utils
-xblock-drag-and-drop-v2==3.2.0
+xblock-drag-and-drop-v2==3.3.0
     # via
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
-xblock-google-drive==0.4.0
+xblock-google-drive==0.5.0
     # via
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
@@ -2226,11 +2229,8 @@ xblock-utils==4.0.0
     # via
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
-    #   done-xblock
     #   edx-sga
     #   lti-consumer-xblock
-    #   staff-graded-xblock
-    #   xblock-drag-and-drop-v2
     #   xblock-google-drive
 xmlsec==1.3.13
     # via
diff --git a/requirements/edx/doc.txt b/requirements/edx/doc.txt
index 1c47fb168fdf..7006772a93bb 100644
--- a/requirements/edx/doc.txt
+++ b/requirements/edx/doc.txt
@@ -14,7 +14,6 @@ aiohttp==3.8.6
     # via
     #   -r requirements/edx/base.txt
     #   geoip2
-    #   openai
 aiosignal==1.3.1
     # via
     #   -r requirements/edx/base.txt
@@ -25,7 +24,7 @@ algoliasearch==2.6.3
     # via
     #   -c requirements/edx/../constraints.txt
     #   -r requirements/edx/base.txt
-amqp==5.1.1
+amqp==5.2.0
     # via
     #   -r requirements/edx/base.txt
     #   kombu
@@ -35,6 +34,15 @@ aniso8601==9.0.1
     # via
     #   -r requirements/edx/base.txt
     #   edx-tincan-py35
+annotated-types==0.6.0
+    # via
+    #   -r requirements/edx/base.txt
+    #   pydantic
+anyio==3.7.1
+    # via
+    #   -r requirements/edx/base.txt
+    #   httpx
+    #   openai
 appdirs==1.4.4
     # via
     #   -r requirements/edx/base.txt
@@ -47,7 +55,6 @@ asgiref==3.7.2
 asn1crypto==1.5.1
     # via
     #   -r requirements/edx/base.txt
-    #   oscrypto
     #   snowflake-connector-python
 async-timeout==4.0.3
     # via
@@ -80,6 +87,7 @@ backoff==1.10.0
 backports-zoneinfo[tzdata]==0.2.1
     # via
     #   -r requirements/edx/base.txt
+    #   backports-zoneinfo
     #   celery
     #   icalendar
     #   kombu
@@ -88,13 +96,14 @@ beautifulsoup4==4.12.2
     #   -r requirements/edx/base.txt
     #   pydata-sphinx-theme
     #   pynliner
-billiard==4.1.0
+billiard==4.2.0
     # via
     #   -r requirements/edx/base.txt
     #   celery
 bleach[css]==6.1.0
     # via
     #   -r requirements/edx/base.txt
+    #   bleach
     #   edx-enterprise
     #   lti-consumer-xblock
     #   openedx-django-wiki
@@ -105,20 +114,20 @@ boto==2.39.0
     # via
     #   -c requirements/edx/../constraints.txt
     #   -r requirements/edx/base.txt
-boto3==1.28.62
+boto3==1.28.83
     # via
     #   -r requirements/edx/base.txt
     #   django-ses
     #   fs-s3fs
     #   ora2
-botocore==1.31.62
+botocore==1.31.83
     # via
     #   -r requirements/edx/base.txt
     #   boto3
     #   s3transfer
 bridgekeeper==0.9
     # via -r requirements/edx/base.txt
-celery==5.3.4
+celery==5.3.5
     # via
     #   -c requirements/edx/../constraints.txt
     #   -r requirements/edx/base.txt
@@ -132,6 +141,8 @@ certifi==2023.7.22
     # via
     #   -r requirements/edx/base.txt
     #   elasticsearch
+    #   httpcore
+    #   httpx
     #   py2neo
     #   requests
     #   snowflake-connector-python
@@ -210,7 +221,7 @@ cryptography==38.0.4
     #   pyopenssl
     #   snowflake-connector-python
     #   social-auth-core
-cssutils==2.7.1
+cssutils==2.9.0
     # via
     #   -r requirements/edx/base.txt
     #   pynliner
@@ -227,7 +238,11 @@ deprecated==1.2.14
     # via
     #   -r requirements/edx/base.txt
     #   jwcrypto
-django==3.2.22
+distro==1.8.0
+    # via
+    #   -r requirements/edx/base.txt
+    #   openai
+django==3.2.23
     # via
     #   -c requirements/edx/../common_constraints.txt
     #   -r requirements/edx/base.txt
@@ -318,7 +333,7 @@ django-config-models==2.5.1
     #   edx-enterprise
     #   edx-name-affirmation
     #   lti-consumer-xblock
-django-cors-headers==4.2.0
+django-cors-headers==4.3.0
     # via -r requirements/edx/base.txt
 django-countries==7.5.1
     # via
@@ -347,7 +362,7 @@ django-filter==23.3
     #   edx-enterprise
     #   lti-consumer-xblock
     #   openedx-blockstore
-django-ipware==5.0.1
+django-ipware==5.0.2
     # via
     #   -r requirements/edx/base.txt
     #   edx-enterprise
@@ -384,7 +399,7 @@ django-multi-email-field==0.7.0
     # via
     #   -r requirements/edx/base.txt
     #   edx-enterprise
-django-mysql==4.11.0
+django-mysql==4.12.0
     # via -r requirements/edx/base.txt
 django-oauth-toolkit==1.7.1
     # via
@@ -473,7 +488,7 @@ docutils==0.19
     #   pydata-sphinx-theme
     #   sphinx
     #   sphinx-mdinclude
-done-xblock==2.1.0
+done-xblock==2.2.0
     # via -r requirements/edx/base.txt
 drf-jwt==1.19.2
     # via
@@ -521,16 +536,16 @@ edx-celeryutils==1.2.3
     #   super-csv
 edx-codejail==3.3.3
     # via -r requirements/edx/base.txt
-edx-completion==4.3.0
+edx-completion==4.4.0
     # via -r requirements/edx/base.txt
 edx-django-release-util==1.3.0
     # via
     #   -r requirements/edx/base.txt
     #   edxval
     #   openedx-blockstore
-edx-django-sites-extensions==4.0.1
+edx-django-sites-extensions==4.0.2
     # via -r requirements/edx/base.txt
-edx-django-utils==5.7.0
+edx-django-utils==5.8.0
     # via
     #   -r requirements/edx/base.txt
     #   django-config-models
@@ -546,8 +561,9 @@ edx-django-utils==5.7.0
     #   openedx-blockstore
     #   ora2
     #   super-csv
-edx-drf-extensions==8.11.0
+edx-drf-extensions==8.12.0
     # via
+    #   -c requirements/edx/../constraints.txt
     #   -r requirements/edx/base.txt
     #   edx-completion
     #   edx-enterprise
@@ -558,7 +574,7 @@ edx-drf-extensions==8.11.0
     #   edx-when
     #   edxval
     #   openedx-learning
-edx-enterprise==4.6.1
+edx-enterprise==4.7.0
     # via
     #   -c requirements/edx/../constraints.txt
     #   -r requirements/edx/base.txt
@@ -583,6 +599,7 @@ edx-opaque-keys[django]==2.5.1
     #   edx-drf-extensions
     #   edx-enterprise
     #   edx-milestones
+    #   edx-opaque-keys
     #   edx-organizations
     #   edx-proctoring
     #   edx-when
@@ -599,7 +616,7 @@ edx-rbac==1.8.0
     # via
     #   -r requirements/edx/base.txt
     #   edx-enterprise
-edx-rest-api-client==5.6.0
+edx-rest-api-client==5.6.1
     # via
     #   -r requirements/edx/base.txt
     #   edx-enterprise
@@ -649,13 +666,18 @@ enmerkar-underscore==2.2.0
 event-tracking==2.2.0
     # via
     #   -r requirements/edx/base.txt
+    #   edx-completion
     #   edx-proctoring
     #   edx-search
-fastavro==1.8.4
+exceptiongroup==1.1.3
+    # via
+    #   -r requirements/edx/base.txt
+    #   anyio
+fastavro==1.9.0
     # via
     #   -r requirements/edx/base.txt
     #   openedx-events
-filelock==3.12.4
+filelock==3.13.1
     # via
     #   -r requirements/edx/base.txt
     #   snowflake-connector-python
@@ -680,25 +702,39 @@ future==0.18.3
     #   pyjwkest
 geoip2==4.7.0
     # via -r requirements/edx/base.txt
-gitdb==4.0.10
+gitdb==4.0.11
     # via gitpython
-gitpython==3.1.37
+gitpython==3.1.40
     # via -r requirements/edx/doc.in
 glob2==0.7
     # via -r requirements/edx/base.txt
 gunicorn==21.2.0
     # via -r requirements/edx/base.txt
+h11==0.14.0
+    # via
+    #   -r requirements/edx/base.txt
+    #   httpcore
 help-tokens==2.3.0
     # via -r requirements/edx/base.txt
 html5lib==1.1
     # via
     #   -r requirements/edx/base.txt
     #   ora2
-icalendar==5.0.10
+httpcore==1.0.2
+    # via
+    #   -r requirements/edx/base.txt
+    #   httpx
+httpx==0.25.1
+    # via
+    #   -r requirements/edx/base.txt
+    #   openai
+icalendar==5.0.11
     # via -r requirements/edx/base.txt
 idna==3.4
     # via
     #   -r requirements/edx/base.txt
+    #   anyio
+    #   httpx
     #   optimizely-sdk
     #   requests
     #   snowflake-connector-python
@@ -710,7 +746,7 @@ importlib-metadata==6.8.0
     #   -r requirements/edx/base.txt
     #   markdown
     #   sphinx
-importlib-resources==6.1.0
+importlib-resources==6.1.1
     # via
     #   -r requirements/edx/base.txt
     #   jsonschema
@@ -762,7 +798,7 @@ jsonfield==3.1.0
     #   edx-submissions
     #   lti-consumer-xblock
     #   ora2
-jsonschema==4.19.1
+jsonschema==4.19.2
     # via
     #   -r requirements/edx/base.txt
     #   drf-spectacular
@@ -777,7 +813,7 @@ jwcrypto==1.5.0
     #   -r requirements/edx/base.txt
     #   django-oauth-toolkit
     #   pylti1p3
-kombu==5.3.2
+kombu==5.3.3
     # via
     #   -r requirements/edx/base.txt
     #   celery
@@ -816,7 +852,7 @@ lxml==4.9.3
     #   xmlsec
 mailsnake==1.6.4
     # via -r requirements/edx/base.txt
-mako==1.2.4
+mako==1.3.0
     # via
     #   -r requirements/edx/base.txt
     #   acid-xblock
@@ -843,7 +879,7 @@ markupsafe==2.1.3
     #   mako
     #   openedx-calc
     #   xblock
-maxminddb==2.4.0
+maxminddb==2.5.1
     # via
     #   -r requirements/edx/base.txt
     #   geoip2
@@ -871,7 +907,7 @@ mysqlclient==2.2.0
     # via
     #   -r requirements/edx/base.txt
     #   openedx-blockstore
-newrelic==9.1.0
+newrelic==9.1.1
     # via
     #   -r requirements/edx/base.txt
     #   edx-django-utils
@@ -897,7 +933,7 @@ oauthlib==3.2.2
     #   social-auth-core
 olxcleaner==0.2.1
     # via -r requirements/edx/base.txt
-openai==0.28.1
+openai==1.2.2
     # via
     #   -r requirements/edx/base.txt
     #   edx-enterprise
@@ -916,7 +952,7 @@ openedx-django-require==2.1.0
     # via -r requirements/edx/base.txt
 openedx-django-wiki==2.0.3
     # via -r requirements/edx/base.txt
-openedx-events==9.0.0
+openedx-events==9.0.1
     # via
     #   -r requirements/edx/base.txt
     #   edx-event-bus-kafka
@@ -925,7 +961,7 @@ openedx-filters==1.6.0
     # via
     #   -r requirements/edx/base.txt
     #   lti-consumer-xblock
-openedx-learning==0.2.3
+openedx-learning==0.3.3
     # via
     #   -c requirements/edx/../constraints.txt
     #   -r requirements/edx/base.txt
@@ -933,12 +969,8 @@ openedx-mongodbproxy==0.2.0
     # via -r requirements/edx/base.txt
 optimizely-sdk==4.1.1
     # via -r requirements/edx/base.txt
-ora2==5.5.4
+ora2==6.0.2
     # via -r requirements/edx/base.txt
-oscrypto==1.3.0
-    # via
-    #   -r requirements/edx/base.txt
-    #   snowflake-connector-python
 packaging==23.2
     # via
     #   -r requirements/edx/base.txt
@@ -965,7 +997,7 @@ path-py==12.5.0
     #   staff-graded-xblock
 paver==1.3.4
     # via -r requirements/edx/base.txt
-pbr==5.11.1
+pbr==6.0.0
     # via
     #   -r requirements/edx/base.txt
     #   stevedore
@@ -990,17 +1022,18 @@ pkgutil-resolve-name==1.3.10
     #   jsonschema
 platformdirs==3.11.0
     # via
+    #   -c requirements/edx/../common_constraints.txt
     #   -r requirements/edx/base.txt
     #   snowflake-connector-python
 polib==1.2.0
     # via
     #   -r requirements/edx/base.txt
     #   edx-i18n-tools
-prompt-toolkit==3.0.39
+prompt-toolkit==3.0.40
     # via
     #   -r requirements/edx/base.txt
     #   click-repl
-psutil==5.9.5
+psutil==5.9.6
     # via
     #   -r requirements/edx/base.txt
     #   edx-django-utils
@@ -1024,8 +1057,15 @@ pycryptodomex==3.19.0
     #   edx-proctoring
     #   lti-consumer-xblock
     #   pyjwkest
-    #   snowflake-connector-python
-pydata-sphinx-theme==0.14.1
+pydantic==2.4.2
+    # via
+    #   -r requirements/edx/base.txt
+    #   openai
+pydantic-core==2.10.1
+    # via
+    #   -r requirements/edx/base.txt
+    #   pydantic
+pydata-sphinx-theme==0.14.3
     # via sphinx-book-theme
 pygments==2.16.1
     # via
@@ -1048,6 +1088,7 @@ pyjwt[crypto]==2.8.0
     #   edx-drf-extensions
     #   edx-proctoring
     #   edx-rest-api-client
+    #   pyjwt
     #   pylti1p3
     #   snowflake-connector-python
     #   social-auth-core
@@ -1084,7 +1125,7 @@ pyparsing==3.1.1
     #   -r requirements/edx/base.txt
     #   chem
     #   openedx-calc
-pyrsistent==0.19.3
+pyrsistent==0.20.0
     # via
     #   -r requirements/edx/base.txt
     #   optimizely-sdk
@@ -1185,7 +1226,6 @@ requests==2.31.0
     #   edx-rest-api-client
     #   geoip2
     #   mailsnake
-    #   openai
     #   optimizely-sdk
     #   pyjwkest
     #   pylti1p3
@@ -1200,12 +1240,12 @@ requests-oauthlib==1.3.1
     # via
     #   -r requirements/edx/base.txt
     #   social-auth-core
-rpds-py==0.10.4
+rpds-py==0.12.0
     # via
     #   -r requirements/edx/base.txt
     #   jsonschema
     #   referencing
-ruamel-yaml==0.17.35
+ruamel-yaml==0.18.5
     # via
     #   -r requirements/edx/base.txt
     #   drf-yasg
@@ -1237,7 +1277,7 @@ semantic-version==2.10.0
     # via
     #   -r requirements/edx/base.txt
     #   edx-drf-extensions
-shapely==2.0.1
+shapely==2.0.2
     # via -r requirements/edx/base.txt
 simplejson==3.19.2
     # via
@@ -1284,9 +1324,14 @@ slumber==0.7.1
     #   edx-rest-api-client
 smmap==5.0.1
     # via gitdb
+sniffio==1.3.0
+    # via
+    #   -r requirements/edx/base.txt
+    #   anyio
+    #   httpx
 snowballstemmer==2.2.0
     # via sphinx
-snowflake-connector-python==3.2.1
+snowflake-connector-python==3.4.1
     # via
     #   -r requirements/edx/base.txt
     #   edx-enterprise
@@ -1329,7 +1374,7 @@ sphinx-design==0.5.0
     # via -r requirements/edx/doc.in
 sphinx-mdinclude==0.5.3
     # via sphinxcontrib-openapi
-sphinx-reredirects==0.1.2
+sphinx-reredirects==0.1.3
     # via -r requirements/edx/doc.in
 sphinxcontrib-applehelp==1.0.4
     # via sphinx
@@ -1341,7 +1386,7 @@ sphinxcontrib-httpdomain==1.8.1
     # via sphinxcontrib-openapi
 sphinxcontrib-jsmath==1.0.1
     # via sphinx
-sphinxcontrib-openapi[markdown]==0.8.1
+sphinxcontrib-openapi[markdown]==0.8.3
     # via -r requirements/edx/doc.in
 sphinxcontrib-qthelp==1.0.3
     # via sphinx
@@ -1354,7 +1399,7 @@ sqlparse==0.4.4
     #   -r requirements/edx/base.txt
     #   django
     #   openedx-blockstore
-staff-graded-xblock==2.1.1
+staff-graded-xblock==2.2.0
     # via -r requirements/edx/base.txt
 stevedore==5.1.0
     # via
@@ -1372,7 +1417,7 @@ sympy==1.12
     # via
     #   -r requirements/edx/base.txt
     #   openedx-calc
-testfixtures==7.2.0
+testfixtures==7.2.2
     # via
     #   -r requirements/edx/base.txt
     #   edx-enterprise
@@ -1384,7 +1429,7 @@ tinycss2==1.2.1
     # via
     #   -r requirements/edx/base.txt
     #   bleach
-tomlkit==0.12.1
+tomlkit==0.12.2
     # via
     #   -r requirements/edx/base.txt
     #   snowflake-connector-python
@@ -1396,10 +1441,14 @@ tqdm==4.66.1
 typing-extensions==4.8.0
     # via
     #   -r requirements/edx/base.txt
+    #   annotated-types
     #   asgiref
     #   django-countries
     #   edx-opaque-keys
     #   kombu
+    #   openai
+    #   pydantic
+    #   pydantic-core
     #   pydata-sphinx-theme
     #   pylti1p3
     #   snowflake-connector-python
@@ -1418,7 +1467,7 @@ uritemplate==4.1.1
     #   coreapi
     #   drf-spectacular
     #   drf-yasg
-urllib3==1.26.17
+urllib3==1.26.18
     # via
     #   -c requirements/edx/../constraints.txt
     #   -r requirements/edx/base.txt
@@ -1429,7 +1478,7 @@ urllib3==1.26.17
     #   snowflake-connector-python
 user-util==1.0.0
     # via -r requirements/edx/base.txt
-vine==5.0.0
+vine==5.1.0
     # via
     #   -r requirements/edx/base.txt
     #   amqp
@@ -1445,7 +1494,7 @@ walrus==0.9.3
     #   edx-event-bus-redis
 watchdog==3.0.0
     # via -r requirements/edx/base.txt
-wcwidth==0.2.8
+wcwidth==0.2.9
     # via
     #   -r requirements/edx/base.txt
     #   prompt-toolkit
@@ -1467,7 +1516,7 @@ webob==1.8.7
     # via
     #   -r requirements/edx/base.txt
     #   xblock
-wrapt==1.15.0
+wrapt==1.16.0
     # via
     #   -r requirements/edx/base.txt
     #   deprecated
@@ -1483,23 +1532,22 @@ xblock[django]==1.8.1
     #   lti-consumer-xblock
     #   ora2
     #   staff-graded-xblock
+    #   xblock
+    #   xblock-drag-and-drop-v2
     #   xblock-google-drive
     #   xblock-poll
     #   xblock-utils
-xblock-drag-and-drop-v2==3.2.0
+xblock-drag-and-drop-v2==3.3.0
     # via -r requirements/edx/base.txt
-xblock-google-drive==0.4.0
+xblock-google-drive==0.5.0
     # via -r requirements/edx/base.txt
 xblock-poll==1.13.0
     # via -r requirements/edx/base.txt
 xblock-utils==4.0.0
     # via
     #   -r requirements/edx/base.txt
-    #   done-xblock
     #   edx-sga
     #   lti-consumer-xblock
-    #   staff-graded-xblock
-    #   xblock-drag-and-drop-v2
     #   xblock-google-drive
 xmlsec==1.3.13
     # via
diff --git a/requirements/edx/kernel.in b/requirements/edx/kernel.in
index 18f4f87faa66..1c727d2f9c2c 100644
--- a/requirements/edx/kernel.in
+++ b/requirements/edx/kernel.in
@@ -158,5 +158,4 @@ user-util                           # Functionality for retiring users (GDPR com
 webob
 web-fragments                       # Provides the ability to render fragments of web pages
 XBlock[django]                      # Courseware component architecture
-xblock-utils                        # Provides utilities used by the Discussion XBlock
 xss-utils                           # https://github.com/edx/edx-platform/pull/20633 Fix XSS via Translations
diff --git a/requirements/edx/paver.txt b/requirements/edx/paver.txt
index 272e8a34a972..6c9381db482a 100644
--- a/requirements/edx/paver.txt
+++ b/requirements/edx/paver.txt
@@ -28,9 +28,9 @@ path==16.7.1
     # via -r requirements/edx/paver.in
 paver==1.3.4
     # via -r requirements/edx/paver.in
-pbr==5.11.1
+pbr==6.0.0
     # via stevedore
-psutil==5.9.5
+psutil==5.9.6
     # via -r requirements/edx/paver.in
 pymemcache==4.0.0
     # via -r requirements/edx/paver.in
@@ -54,11 +54,11 @@ stevedore==5.1.0
     #   edx-opaque-keys
 typing-extensions==4.8.0
     # via edx-opaque-keys
-urllib3==1.26.17
+urllib3==1.26.18
     # via
     #   -c requirements/edx/../constraints.txt
     #   requests
 watchdog==3.0.0
     # via -r requirements/edx/paver.in
-wrapt==1.15.0
+wrapt==1.16.0
     # via -r requirements/edx/paver.in
diff --git a/requirements/edx/semgrep.txt b/requirements/edx/semgrep.txt
index 31dcbbf984e0..d212d1903fc3 100644
--- a/requirements/edx/semgrep.txt
+++ b/requirements/edx/semgrep.txt
@@ -40,11 +40,11 @@ glom==22.1.0
     # via semgrep
 idna==3.4
     # via requests
-importlib-resources==6.1.0
+importlib-resources==6.1.1
     # via
     #   jsonschema
     #   jsonschema-specifications
-jsonschema==4.19.1
+jsonschema==4.19.2
     # via semgrep
 jsonschema-specifications==2023.7.1
     # via jsonschema
@@ -54,14 +54,12 @@ mdurl==0.1.2
     # via markdown-it-py
 packaging==23.2
     # via semgrep
-peewee==3.16.3
+peewee==3.17.0
     # via semgrep
 pkgutil-resolve-name==1.3.10
     # via jsonschema
 pygments==2.16.1
     # via rich
-python-lsp-jsonrpc==1.0.0
-    # via semgrep
 referencing==0.30.2
     # via
     #   jsonschema
@@ -70,15 +68,15 @@ requests==2.31.0
     # via semgrep
 rich==13.6.0
     # via semgrep
-rpds-py==0.10.4
+rpds-py==0.12.0
     # via
     #   jsonschema
     #   referencing
-ruamel-yaml==0.17.35
+ruamel-yaml==0.17.40
     # via semgrep
 ruamel-yaml-clib==0.2.8
     # via ruamel-yaml
-semgrep==1.43.0
+semgrep==1.48.0
     # via -r requirements/edx/semgrep.in
 tomli==2.0.1
     # via semgrep
@@ -86,9 +84,7 @@ typing-extensions==4.8.0
     # via
     #   rich
     #   semgrep
-ujson==5.8.0
-    # via python-lsp-jsonrpc
-urllib3==1.26.17
+urllib3==1.26.18
     # via
     #   -c requirements/edx/../constraints.txt
     #   requests
diff --git a/requirements/edx/testing.in b/requirements/edx/testing.in
index 93310adc88f1..a0b4c5bff5a4 100644
--- a/requirements/edx/testing.in
+++ b/requirements/edx/testing.in
@@ -18,7 +18,6 @@
 -r coverage.txt           # Utilities for calculating test coverage
 
 beautifulsoup4            # Library for extracting data from HTML and XML files
-bok-choy                  # Framework for browser automation tests, based on selenium
 code-annotations          # Perform code annotation checking, such as for PII annotations
 cssselect                 # Used to extract HTML fragments via CSS selectors in 2 test cases and pyquery
 ddt                       # Run a test case multiple times with different input; used in many, many of our tests
@@ -41,11 +40,9 @@ pytest-json-report        # Output json formatted warnings after running pytest
 pytest-metadata==1.8.0     # To prevent 'make upgrade' failure, dependency of pytest-json-report
 pytest-randomly           # pytest plugin to randomly order tests
 pytest-xdist[psutil]      # Parallel execution of tests on multiple CPU cores or hosts
-selenium                  # Browser automation library, used for acceptance tests
 singledispatch            # Backport of functools.singledispatch from Python 3.4+, used in tests of XBlock rendering
 testfixtures              # Provides a LogCapture utility used by several tests
 tox                       # virtualenv management for tests
-tox-battery               # Makes tox aware of requirements file changes
 unidiff                   # Required by coverage_pytest_plugin
 pylint-pytest==0.3.0      # A Pylint plugin to suppress pytest-related false positives.
 pact-python               # Library for contract testing
diff --git a/requirements/edx/testing.txt b/requirements/edx/testing.txt
index deb8baa552f1..9d9a2ea89f3a 100644
--- a/requirements/edx/testing.txt
+++ b/requirements/edx/testing.txt
@@ -12,7 +12,6 @@ aiohttp==3.8.6
     # via
     #   -r requirements/edx/base.txt
     #   geoip2
-    #   openai
 aiosignal==1.3.1
     # via
     #   -r requirements/edx/base.txt
@@ -21,7 +20,7 @@ algoliasearch==2.6.3
     # via
     #   -c requirements/edx/../constraints.txt
     #   -r requirements/edx/base.txt
-amqp==5.1.1
+amqp==5.2.0
     # via
     #   -r requirements/edx/base.txt
     #   kombu
@@ -32,11 +31,15 @@ aniso8601==9.0.1
     #   -r requirements/edx/base.txt
     #   edx-tincan-py35
 annotated-types==0.6.0
-    # via pydantic
+    # via
+    #   -r requirements/edx/base.txt
+    #   pydantic
 anyio==3.7.1
     # via
+    #   -r requirements/edx/base.txt
     #   fastapi
-    #   httpcore
+    #   httpx
+    #   openai
     #   starlette
 appdirs==1.4.4
     # via
@@ -50,7 +53,6 @@ asgiref==3.7.2
 asn1crypto==1.5.1
     # via
     #   -r requirements/edx/base.txt
-    #   oscrypto
     #   snowflake-connector-python
 astroid==2.13.5
     # via
@@ -85,6 +87,7 @@ backoff==1.10.0
 backports-zoneinfo[tzdata]==0.2.1
     # via
     #   -r requirements/edx/base.txt
+    #   backports-zoneinfo
     #   celery
     #   icalendar
     #   kombu
@@ -93,39 +96,38 @@ beautifulsoup4==4.12.2
     #   -r requirements/edx/base.txt
     #   -r requirements/edx/testing.in
     #   pynliner
-billiard==4.1.0
+billiard==4.2.0
     # via
     #   -r requirements/edx/base.txt
     #   celery
 bleach[css]==6.1.0
     # via
     #   -r requirements/edx/base.txt
+    #   bleach
     #   edx-enterprise
     #   lti-consumer-xblock
     #   openedx-django-wiki
     #   ora2
     #   xblock-drag-and-drop-v2
     #   xblock-poll
-bok-choy==2.0.2
-    # via -r requirements/edx/testing.in
 boto==2.39.0
     # via
     #   -c requirements/edx/../constraints.txt
     #   -r requirements/edx/base.txt
-boto3==1.28.62
+boto3==1.28.83
     # via
     #   -r requirements/edx/base.txt
     #   django-ses
     #   fs-s3fs
     #   ora2
-botocore==1.31.62
+botocore==1.31.83
     # via
     #   -r requirements/edx/base.txt
     #   boto3
     #   s3transfer
 bridgekeeper==0.9
     # via -r requirements/edx/base.txt
-celery==5.3.4
+celery==5.3.5
     # via
     #   -c requirements/edx/../constraints.txt
     #   -r requirements/edx/base.txt
@@ -237,11 +239,11 @@ cssselect==1.2.0
     # via
     #   -r requirements/edx/testing.in
     #   pyquery
-cssutils==2.7.1
+cssutils==2.9.0
     # via
     #   -r requirements/edx/base.txt
     #   pynliner
-ddt==1.6.0
+ddt==1.7.0
     # via -r requirements/edx/testing.in
 defusedxml==0.7.1
     # via
@@ -254,13 +256,17 @@ deprecated==1.2.14
     # via
     #   -r requirements/edx/base.txt
     #   jwcrypto
-diff-cover==7.7.0
+diff-cover==8.0.0
     # via -r requirements/edx/coverage.txt
 dill==0.3.7
     # via pylint
 distlib==0.3.7
     # via virtualenv
-django==3.2.22
+distro==1.8.0
+    # via
+    #   -r requirements/edx/base.txt
+    #   openai
+django==3.2.23
     # via
     #   -c requirements/edx/../common_constraints.txt
     #   -r requirements/edx/base.txt
@@ -351,7 +357,7 @@ django-config-models==2.5.1
     #   edx-enterprise
     #   edx-name-affirmation
     #   lti-consumer-xblock
-django-cors-headers==4.2.0
+django-cors-headers==4.3.0
     # via -r requirements/edx/base.txt
 django-countries==7.5.1
     # via
@@ -380,7 +386,7 @@ django-filter==23.3
     #   edx-enterprise
     #   lti-consumer-xblock
     #   openedx-blockstore
-django-ipware==5.0.1
+django-ipware==5.0.2
     # via
     #   -r requirements/edx/base.txt
     #   edx-enterprise
@@ -417,7 +423,7 @@ django-multi-email-field==0.7.0
     # via
     #   -r requirements/edx/base.txt
     #   edx-enterprise
-django-mysql==4.11.0
+django-mysql==4.12.0
     # via -r requirements/edx/base.txt
 django-oauth-toolkit==1.7.1
     # via
@@ -500,7 +506,7 @@ djangorestframework-xml==2.0.0
     # via
     #   -r requirements/edx/base.txt
     #   edx-enterprise
-done-xblock==2.1.0
+done-xblock==2.2.0
     # via -r requirements/edx/base.txt
 drf-jwt==1.19.2
     # via
@@ -548,16 +554,16 @@ edx-celeryutils==1.2.3
     #   super-csv
 edx-codejail==3.3.3
     # via -r requirements/edx/base.txt
-edx-completion==4.3.0
+edx-completion==4.4.0
     # via -r requirements/edx/base.txt
 edx-django-release-util==1.3.0
     # via
     #   -r requirements/edx/base.txt
     #   edxval
     #   openedx-blockstore
-edx-django-sites-extensions==4.0.1
+edx-django-sites-extensions==4.0.2
     # via -r requirements/edx/base.txt
-edx-django-utils==5.7.0
+edx-django-utils==5.8.0
     # via
     #   -r requirements/edx/base.txt
     #   django-config-models
@@ -573,8 +579,9 @@ edx-django-utils==5.7.0
     #   openedx-blockstore
     #   ora2
     #   super-csv
-edx-drf-extensions==8.11.0
+edx-drf-extensions==8.12.0
     # via
+    #   -c requirements/edx/../constraints.txt
     #   -r requirements/edx/base.txt
     #   edx-completion
     #   edx-enterprise
@@ -585,7 +592,7 @@ edx-drf-extensions==8.11.0
     #   edx-when
     #   edxval
     #   openedx-learning
-edx-enterprise==4.6.1
+edx-enterprise==4.7.0
     # via
     #   -c requirements/edx/../constraints.txt
     #   -r requirements/edx/base.txt
@@ -598,7 +605,7 @@ edx-i18n-tools==1.3.0
     #   -r requirements/edx/base.txt
     #   -r requirements/edx/testing.in
     #   ora2
-edx-lint==5.3.4
+edx-lint==5.3.6
     # via -r requirements/edx/testing.in
 edx-milestones==0.5.0
     # via -r requirements/edx/base.txt
@@ -613,6 +620,7 @@ edx-opaque-keys[django]==2.5.1
     #   edx-drf-extensions
     #   edx-enterprise
     #   edx-milestones
+    #   edx-opaque-keys
     #   edx-organizations
     #   edx-proctoring
     #   edx-when
@@ -629,7 +637,7 @@ edx-rbac==1.8.0
     # via
     #   -r requirements/edx/base.txt
     #   edx-enterprise
-edx-rest-api-client==5.6.0
+edx-rest-api-client==5.6.1
     # via
     #   -r requirements/edx/base.txt
     #   edx-enterprise
@@ -679,25 +687,27 @@ enmerkar-underscore==2.2.0
 event-tracking==2.2.0
     # via
     #   -r requirements/edx/base.txt
+    #   edx-completion
     #   edx-proctoring
     #   edx-search
 exceptiongroup==1.1.3
     # via
+    #   -r requirements/edx/base.txt
     #   anyio
     #   pytest
 execnet==2.0.2
     # via pytest-xdist
 factory-boy==3.3.0
     # via -r requirements/edx/testing.in
-faker==19.8.0
+faker==19.13.0
     # via factory-boy
-fastapi==0.103.2
+fastapi==0.104.1
     # via pact-python
-fastavro==1.8.4
+fastavro==1.9.0
     # via
     #   -r requirements/edx/base.txt
     #   openedx-events
-filelock==3.12.4
+filelock==3.13.1
     # via
     #   -r requirements/edx/base.txt
     #   snowflake-connector-python
@@ -728,12 +738,13 @@ geoip2==4.7.0
     # via -r requirements/edx/base.txt
 glob2==0.7
     # via -r requirements/edx/base.txt
-grimp==3.0
+grimp==3.1
     # via import-linter
 gunicorn==21.2.0
     # via -r requirements/edx/base.txt
 h11==0.14.0
     # via
+    #   -r requirements/edx/base.txt
     #   httpcore
     #   uvicorn
 help-tokens==2.3.0
@@ -742,31 +753,35 @@ html5lib==1.1
     # via
     #   -r requirements/edx/base.txt
     #   ora2
-httpcore==0.16.3
-    # via httpx
+httpcore==1.0.2
+    # via
+    #   -r requirements/edx/base.txt
+    #   httpx
 httpretty==1.1.4
     # via -r requirements/edx/testing.in
-httpx==0.23.3
-    # via pact-python
-icalendar==5.0.10
+httpx==0.25.1
+    # via
+    #   -r requirements/edx/base.txt
+    #   openai
+icalendar==5.0.11
     # via -r requirements/edx/base.txt
 idna==3.4
     # via
     #   -r requirements/edx/base.txt
     #   anyio
+    #   httpx
     #   optimizely-sdk
     #   requests
-    #   rfc3986
     #   snowflake-connector-python
     #   yarl
-import-linter==1.12.0
+import-linter==1.12.1
     # via -r requirements/edx/testing.in
 importlib-metadata==6.8.0
     # via
     #   -r requirements/edx/base.txt
     #   markdown
     #   pytest-randomly
-importlib-resources==6.1.0
+importlib-resources==6.1.1
     # via
     #   -r requirements/edx/base.txt
     #   jsonschema
@@ -825,7 +840,7 @@ jsonfield==3.1.0
     #   edx-submissions
     #   lti-consumer-xblock
     #   ora2
-jsonschema==4.19.1
+jsonschema==4.19.2
     # via
     #   -r requirements/edx/base.txt
     #   drf-spectacular
@@ -839,7 +854,7 @@ jwcrypto==1.5.0
     #   -r requirements/edx/base.txt
     #   django-oauth-toolkit
     #   pylti1p3
-kombu==5.3.2
+kombu==5.3.3
     # via
     #   -r requirements/edx/base.txt
     #   celery
@@ -849,7 +864,6 @@ lazy==1.6
     # via
     #   -r requirements/edx/base.txt
     #   acid-xblock
-    #   bok-choy
     #   lti-consumer-xblock
     #   ora2
     #   xblock
@@ -882,7 +896,7 @@ lxml==4.9.3
     #   xmlsec
 mailsnake==1.6.4
     # via -r requirements/edx/base.txt
-mako==1.2.4
+mako==1.3.0
     # via
     #   -r requirements/edx/base.txt
     #   acid-xblock
@@ -910,7 +924,7 @@ markupsafe==2.1.3
     #   mako
     #   openedx-calc
     #   xblock
-maxminddb==2.4.0
+maxminddb==2.5.1
     # via
     #   -r requirements/edx/base.txt
     #   geoip2
@@ -938,7 +952,7 @@ mysqlclient==2.2.0
     # via
     #   -r requirements/edx/base.txt
     #   openedx-blockstore
-newrelic==9.1.0
+newrelic==9.1.1
     # via
     #   -r requirements/edx/base.txt
     #   edx-django-utils
@@ -964,7 +978,7 @@ oauthlib==3.2.2
     #   social-auth-core
 olxcleaner==0.2.1
     # via -r requirements/edx/base.txt
-openai==0.28.1
+openai==1.2.2
     # via
     #   -r requirements/edx/base.txt
     #   edx-enterprise
@@ -983,7 +997,7 @@ openedx-django-require==2.1.0
     # via -r requirements/edx/base.txt
 openedx-django-wiki==2.0.3
     # via -r requirements/edx/base.txt
-openedx-events==9.0.0
+openedx-events==9.0.1
     # via
     #   -r requirements/edx/base.txt
     #   edx-event-bus-kafka
@@ -992,7 +1006,7 @@ openedx-filters==1.6.0
     # via
     #   -r requirements/edx/base.txt
     #   lti-consumer-xblock
-openedx-learning==0.2.3
+openedx-learning==0.3.3
     # via
     #   -c requirements/edx/../constraints.txt
     #   -r requirements/edx/base.txt
@@ -1000,12 +1014,8 @@ openedx-mongodbproxy==0.2.0
     # via -r requirements/edx/base.txt
 optimizely-sdk==4.1.1
     # via -r requirements/edx/base.txt
-ora2==5.5.4
+ora2==6.0.2
     # via -r requirements/edx/base.txt
-oscrypto==1.3.0
-    # via
-    #   -r requirements/edx/base.txt
-    #   snowflake-connector-python
 packaging==23.2
     # via
     #   -r requirements/edx/base.txt
@@ -1015,7 +1025,7 @@ packaging==23.2
     #   pytest
     #   snowflake-connector-python
     #   tox
-pact-python==2.0.1
+pact-python==2.1.1
     # via -r requirements/edx/testing.in
 pansi==2020.7.3
     # via
@@ -1034,7 +1044,7 @@ path-py==12.5.0
     #   staff-graded-xblock
 paver==1.3.4
     # via -r requirements/edx/base.txt
-pbr==5.11.1
+pbr==6.0.0
     # via
     #   -r requirements/edx/base.txt
     #   stevedore
@@ -1057,6 +1067,7 @@ pkgutil-resolve-name==1.3.10
     #   jsonschema
 platformdirs==3.11.0
     # via
+    #   -c requirements/edx/../common_constraints.txt
     #   -r requirements/edx/base.txt
     #   pylint
     #   snowflake-connector-python
@@ -1072,11 +1083,11 @@ polib==1.2.0
     #   -r requirements/edx/base.txt
     #   -r requirements/edx/testing.in
     #   edx-i18n-tools
-prompt-toolkit==3.0.39
+prompt-toolkit==3.0.40
     # via
     #   -r requirements/edx/base.txt
     #   click-repl
-psutil==5.9.5
+psutil==5.9.6
     # via
     #   -r requirements/edx/base.txt
     #   edx-django-utils
@@ -1108,11 +1119,15 @@ pycryptodomex==3.19.0
     #   edx-proctoring
     #   lti-consumer-xblock
     #   pyjwkest
-    #   snowflake-connector-python
 pydantic==2.4.2
-    # via fastapi
+    # via
+    #   -r requirements/edx/base.txt
+    #   fastapi
+    #   openai
 pydantic-core==2.10.1
-    # via pydantic
+    # via
+    #   -r requirements/edx/base.txt
+    #   pydantic
 pygments==2.16.1
     # via
     #   -r requirements/edx/base.txt
@@ -1132,6 +1147,7 @@ pyjwt[crypto]==2.8.0
     #   edx-drf-extensions
     #   edx-proctoring
     #   edx-rest-api-client
+    #   pyjwt
     #   pylti1p3
     #   snowflake-connector-python
     #   social-auth-core
@@ -1149,7 +1165,7 @@ pylint==2.15.10
     #   pylint-pytest
 pylint-celery==0.3
     # via edx-lint
-pylint-django==2.5.3
+pylint-django==2.5.5
     # via edx-lint
 pylint-plugin-utils==0.8.2
     # via
@@ -1188,7 +1204,7 @@ pyparsing==3.1.1
     #   openedx-calc
 pyquery==2.0.0
     # via -r requirements/edx/testing.in
-pyrsistent==0.19.3
+pyrsistent==0.20.0
     # via
     #   -r requirements/edx/base.txt
     #   optimizely-sdk
@@ -1196,7 +1212,7 @@ pysrt==1.1.2
     # via
     #   -r requirements/edx/base.txt
     #   edxval
-pytest==7.4.2
+pytest==7.4.3
     # via
     #   -r requirements/edx/testing.in
     #   pylint-pytest
@@ -1211,7 +1227,7 @@ pytest-attrib==0.1.3
     # via -r requirements/edx/testing.in
 pytest-cov==4.1.0
     # via -r requirements/edx/testing.in
-pytest-django==4.5.2
+pytest-django==4.7.0
     # via -r requirements/edx/testing.in
 pytest-json-report==1.5.0
     # via -r requirements/edx/testing.in
@@ -1317,7 +1333,6 @@ requests==2.31.0
     #   edx-rest-api-client
     #   geoip2
     #   mailsnake
-    #   openai
     #   optimizely-sdk
     #   pact-python
     #   pyjwkest
@@ -1332,14 +1347,12 @@ requests-oauthlib==1.3.1
     # via
     #   -r requirements/edx/base.txt
     #   social-auth-core
-rfc3986[idna2008]==1.5.0
-    # via httpx
-rpds-py==0.10.4
+rpds-py==0.12.0
     # via
     #   -r requirements/edx/base.txt
     #   jsonschema
     #   referencing
-ruamel-yaml==0.17.35
+ruamel-yaml==0.18.5
     # via
     #   -r requirements/edx/base.txt
     #   drf-yasg
@@ -1367,15 +1380,11 @@ scipy==1.7.3
     #   -r requirements/edx/base.txt
     #   chem
     #   openedx-calc
-selenium==3.141.0
-    # via
-    #   -r requirements/edx/testing.in
-    #   bok-choy
 semantic-version==2.10.0
     # via
     #   -r requirements/edx/base.txt
     #   edx-drf-extensions
-shapely==2.0.1
+shapely==2.0.2
     # via -r requirements/edx/base.txt
 simplejson==3.19.2
     # via
@@ -1426,10 +1435,10 @@ slumber==0.7.1
     #   edx-rest-api-client
 sniffio==1.3.0
     # via
+    #   -r requirements/edx/base.txt
     #   anyio
-    #   httpcore
     #   httpx
-snowflake-connector-python==3.2.1
+snowflake-connector-python==3.4.1
     # via
     #   -r requirements/edx/base.txt
     #   edx-enterprise
@@ -1461,7 +1470,7 @@ sqlparse==0.4.4
     #   -r requirements/edx/base.txt
     #   django
     #   openedx-blockstore
-staff-graded-xblock==2.1.1
+staff-graded-xblock==2.2.0
     # via -r requirements/edx/base.txt
 starlette==0.27.0
     # via fastapi
@@ -1481,7 +1490,7 @@ sympy==1.12
     # via
     #   -r requirements/edx/base.txt
     #   openedx-calc
-testfixtures==7.2.0
+testfixtures==7.2.2
     # via
     #   -r requirements/edx/base.txt
     #   -r requirements/edx/testing.in
@@ -1501,17 +1510,12 @@ tomli==2.0.1
     #   pylint
     #   pytest
     #   tox
-tomlkit==0.12.1
+tomlkit==0.12.2
     # via
     #   -r requirements/edx/base.txt
     #   pylint
     #   snowflake-connector-python
 tox==3.28.0
-    # via
-    #   -c requirements/edx/../common_constraints.txt
-    #   -r requirements/edx/testing.in
-    #   tox-battery
-tox-battery==0.6.2
     # via -r requirements/edx/testing.in
 tqdm==4.66.1
     # via
@@ -1531,6 +1535,7 @@ typing-extensions==4.8.0
     #   grimp
     #   import-linter
     #   kombu
+    #   openai
     #   pydantic
     #   pydantic-core
     #   pylint
@@ -1555,28 +1560,26 @@ uritemplate==4.1.1
     #   coreapi
     #   drf-spectacular
     #   drf-yasg
-urllib3==1.26.17
+urllib3==1.26.18
     # via
     #   -c requirements/edx/../constraints.txt
     #   -r requirements/edx/base.txt
     #   botocore
     #   elasticsearch
-    #   pact-python
     #   py2neo
     #   requests
-    #   selenium
     #   snowflake-connector-python
 user-util==1.0.0
     # via -r requirements/edx/base.txt
-uvicorn==0.23.2
+uvicorn==0.24.0.post1
     # via pact-python
-vine==5.0.0
+vine==5.1.0
     # via
     #   -r requirements/edx/base.txt
     #   amqp
     #   celery
     #   kombu
-virtualenv==20.24.5
+virtualenv==20.24.6
     # via tox
 voluptuous==0.13.1
     # via
@@ -1588,7 +1591,7 @@ walrus==0.9.3
     #   edx-event-bus-redis
 watchdog==3.0.0
     # via -r requirements/edx/base.txt
-wcwidth==0.2.8
+wcwidth==0.2.9
     # via
     #   -r requirements/edx/base.txt
     #   prompt-toolkit
@@ -1610,7 +1613,7 @@ webob==1.8.7
     # via
     #   -r requirements/edx/base.txt
     #   xblock
-wrapt==1.15.0
+wrapt==1.16.0
     # via
     #   -r requirements/edx/base.txt
     #   astroid
@@ -1627,23 +1630,22 @@ xblock[django]==1.8.1
     #   lti-consumer-xblock
     #   ora2
     #   staff-graded-xblock
+    #   xblock
+    #   xblock-drag-and-drop-v2
     #   xblock-google-drive
     #   xblock-poll
     #   xblock-utils
-xblock-drag-and-drop-v2==3.2.0
+xblock-drag-and-drop-v2==3.3.0
     # via -r requirements/edx/base.txt
-xblock-google-drive==0.4.0
+xblock-google-drive==0.5.0
     # via -r requirements/edx/base.txt
 xblock-poll==1.13.0
     # via -r requirements/edx/base.txt
 xblock-utils==4.0.0
     # via
     #   -r requirements/edx/base.txt
-    #   done-xblock
     #   edx-sga
     #   lti-consumer-xblock
-    #   staff-graded-xblock
-    #   xblock-drag-and-drop-v2
     #   xblock-google-drive
 xmlsec==1.3.13
     # via
diff --git a/requirements/pip-tools.txt b/requirements/pip-tools.txt
index ea283f4ad3ad..26a9f37f6072 100644
--- a/requirements/pip-tools.txt
+++ b/requirements/pip-tools.txt
@@ -23,7 +23,7 @@ tomli==2.0.1
     #   build
     #   pip-tools
     #   pyproject-hooks
-wheel==0.41.2
+wheel==0.41.3
     # via pip-tools
 zipp==3.17.0
     # via importlib-metadata
diff --git a/requirements/pip.txt b/requirements/pip.txt
index 3e7d8f4a813f..9014f2cf9a55 100644
--- a/requirements/pip.txt
+++ b/requirements/pip.txt
@@ -4,11 +4,11 @@
 #
 #    make upgrade
 #
-wheel==0.41.2
+wheel==0.41.3
     # via -r requirements/pip.in
 
 # The following packages are considered to be unsafe in a requirements file:
-pip==23.2.1
+pip==23.3.1
     # via -r requirements/pip.in
 setuptools==68.2.2
     # via -r requirements/pip.in
diff --git a/scripts/generic-ci-tests.sh b/scripts/generic-ci-tests.sh
index 5aabf8fde4c2..f854a3e36cda 100755
--- a/scripts/generic-ci-tests.sh
+++ b/scripts/generic-ci-tests.sh
@@ -20,11 +20,10 @@ set -e
 #       - "pavelib-unit": Run Python unit tests from the pavelib/lib directory
 #       - "pavelib-js-unit": Run the JavaScript tests and the Python unit
 #           tests from the pavelib/lib directory
-#       - "bok-choy": Run acceptance tests that use the bok-choy framework
 #
 #   `SHARD` is a number indicating which subset of the tests to build.
 #
-#       For "bok-choy" and "lms-unit", the tests are put into shard groups
+#       For "lms-unit", the tests are put into shard groups
 #       using the 'attr' decorator (e.g. "@attr(shard=1)"). Anything with
 #       the 'shard=n' attribute will run in the nth shard. If there isn't a
 #       shard explicitly assigned, the test will run in the last shard.
diff --git a/scripts/reset-test-db.sh b/scripts/reset-test-db.sh
deleted file mode 100755
index fd751b75dd30..000000000000
--- a/scripts/reset-test-db.sh
+++ /dev/null
@@ -1,140 +0,0 @@
-#!/usr/bin/env bash
-
-############################################################################
-#
-#   reset-test-db.sh
-#
-#   Resets the MySQL test database for the bok-choy acceptance tests.
-#
-#   If it finds a cached schema and migration history, it will start
-#   from the cached version to speed up migrations.
-#
-#   If no cached database exists, it will create one.  This can be
-#   checked into the repo to speed up future tests.
-#
-#   Note that we do NOT want to re-use the cache between test runs!
-#   A newer commit could introduce migrations that do not exist
-#   in other commits, which could cause migrations to fail in the other
-#   commits.
-#
-#   For this reason, we always use a cache that was committed to master
-#   at the time the branch was created.
-#
-############################################################################
-
-# Fail fast
-set -e
-
-DB_CACHE_DIR="common/test/db_cache"
-
-if [[ -z "$BOK_CHOY_HOSTNAME" ]]; then
-    MYSQL_HOST=""
-    SETTINGS="bok_choy"
-else
-    MYSQL_HOST="--host=edx.devstack.mysql80"
-    SETTINGS="bok_choy_docker"
-fi
-
-for i in "$@"; do
-    case $i in
-        -r|--rebuild_cache)
-            REBUILD_CACHE=true
-            ;;
-        -m|--migrations)
-            APPLY_MIGRATIONS=true
-            ;;
-        -c|--calculate_migrations)
-            CALCULATE_MIGRATIONS=true
-            ;;
-        -u|--use-existing-db)
-            USE_EXISTING_DB=true
-            ;;
-    esac
-done
-
-declare -A databases
-declare -a database_order
-databases=(["default"]="edxtest" ["student_module_history"]="student_module_history_test")
-database_order=("default" "student_module_history")
-
-calculate_migrations() {
-    echo "Calculating migrations for fingerprinting."
-    output_file="common/test/db_cache/bok_choy_${db}_migrations.yaml"
-    # Redirect stdout to /dev/null because the script will print
-    # out all migrations to both stdout and the output file.
-    ./manage.py lms --settings "$SETTINGS" show_unapplied_migrations --database "$db" --output_file "$output_file" 1>/dev/null
-}
-
-run_migrations() {
-    echo "Running the lms migrations on the $db bok_choy DB."
-    ./manage.py lms --settings "$SETTINGS" migrate --database "$db" --traceback --noinput
-    echo "Running the cms migrations on the $db bok_choy DB."
-    ./manage.py cms --settings "$SETTINGS" migrate --database "$db" --traceback --noinput
-}
-
-load_cache_into_db() {
-    echo "Loading the schema from the filesystem into the $db MySQL DB."
-    mysql "$MYSQL_HOST" -u root "${databases["$db"]}" < "$DB_CACHE_DIR/bok_choy_schema_$db.sql"
-    echo "Loading the fixture data from the filesystem into the $db MySQL DB."
-    ./manage.py lms --settings "$SETTINGS" loaddata --database "$db" "$DB_CACHE_DIR/bok_choy_data_$db.json"
-    echo "Loading the migration data from the filesystem into the $db MySQL DB."
-    mysql "$MYSQL_HOST" -u root "${databases["$db"]}" < "$DB_CACHE_DIR/bok_choy_migrations_data_$db.sql"
-}
-
-rebuild_cache_for_db() {
-    # Make sure the DB has all migrations applied
-    run_migrations
-
-    # Dump the schema and data to the cache
-    echo "Using the dumpdata command to save the $db fixture data to the filesystem."
-    ./manage.py lms --settings "$SETTINGS" dumpdata --database "$db" > "$DB_CACHE_DIR/bok_choy_data_$db.json" --exclude=api_admin.Catalog
-    echo "Saving the schema of the $db bok_choy DB to the filesystem."
-    mysqldump "$MYSQL_HOST" -u root --no-data --skip-comments --skip-dump-date "${databases[$db]}" > "$DB_CACHE_DIR/bok_choy_schema_$db.sql"
-
-    # dump_data does not dump the django_migrations table so we do it separately.
-    echo "Saving the django_migrations table of the $db bok_choy DB to the filesystem."
-    mysqldump $MYSQL_HOST -u root --no-create-info --skip-comments --skip-dump-date "${databases["$db"]}" django_migrations > "$DB_CACHE_DIR/bok_choy_migrations_data_$db.sql"
-}
-
-for db in "${database_order[@]}"; do
-    if ! [[ $USE_EXISTING_DB ]]; then
-        echo "CREATE DATABASE IF NOT EXISTS ${databases[$db]};" | mysql $MYSQL_HOST -u root
-
-        # Clear out the test database
-        #
-        # We are using the reset_db command which uses "DROP DATABASE" and
-        # "CREATE DATABASE" in case the tests are being run in an environment (e.g. devstack
-        # or a jenkins worker environment) that already ran tests on another commit that had
-        # different migrations that created, dropped, or altered tables.
-        echo "Issuing a reset_db command to the $db bok_choy MySQL database."
-        ./manage.py lms --settings "$SETTINGS" reset_db --traceback --router "$db"
-    fi
-
-    if ! [[ $CALCULATE_MIGRATIONS ]]; then
-        # If there are cached database schemas/data, then load them.
-        # If they are missing, then we will want to build new cache files even if
-        # not explicitly directed to do so via arguments passed to this script.
-        if [[ ! -f $DB_CACHE_DIR/bok_choy_schema_$db.sql || ! -f $DB_CACHE_DIR/bok_choy_data_$db.json || ! -f $DB_CACHE_DIR/bok_choy_migrations_data_$db.sql ]]; then
-            REBUILD_CACHE=true
-        else
-            load_cache_into_db
-        fi
-    fi
-done
-
-if [[ $REBUILD_CACHE ]]; then
-    echo "Cleaning the DB cache directory and building new files."
-    mkdir -p $DB_CACHE_DIR && rm -f $DB_CACHE_DIR/bok_choy*
-
-    for db in "${database_order[@]}"; do
-        rebuild_cache_for_db
-    done
-elif [[ $APPLY_MIGRATIONS ]]; then
-    for db in "${database_order[@]}"; do
-        run_migrations
-    done
-elif [[ $CALCULATE_MIGRATIONS ]]; then
-    for db in "${database_order[@]}"; do
-        calculate_migrations
-    done
-fi
diff --git a/scripts/xblock/requirements.txt b/scripts/xblock/requirements.txt
index b39be9898313..8e6d15705c4f 100644
--- a/scripts/xblock/requirements.txt
+++ b/scripts/xblock/requirements.txt
@@ -6,11 +6,11 @@
 #
 certifi==2023.7.22
     # via requests
-charset-normalizer==3.3.0
+charset-normalizer==3.3.2
     # via requests
 idna==3.4
     # via requests
 requests==2.31.0
     # via -r scripts/xblock/requirements.in
-urllib3==2.0.6
+urllib3==2.0.7
     # via requests
diff --git a/setup.cfg b/setup.cfg
index fe889355a753..fe776ec580a4 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -12,6 +12,17 @@ filterwarnings =
     default
     ignore:No request passed to the backend, unable to rate-limit:UserWarning
     ignore::xblock.exceptions.FieldDataDeprecationWarning
+    # Remove default_app_config warning after updating Django to 4.2
+    ignore:.*You can remove default_app_config.*:PendingDeprecationWarning
+    ignore:Instead access HTTPResponse.headers directly.*:DeprecationWarning:elasticsearch
+    # ABC deprecation Warning comes from libsass
+    ignore:Using or importing the ABCs from 'collections' instead of from 'collections.abc' is deprecated.*:DeprecationWarning:sass
+    # declare_namespace Warning comes from XBlock https://github.com/openedx/XBlock/issues/641
+    # and also due to dependency: https://github.com/PyFilesystem/pyfilesystem2
+    ignore:Deprecated call to `pkg_resources.declare_namespace.*:DeprecationWarning
+    ignore:.*pkg_resources is deprecated as an API.*:DeprecationWarning
+    ignore:'etree' is deprecated. Use 'xml.etree.ElementTree' instead.:DeprecationWarning:wiki
+
 junit_family = xunit2
 norecursedirs = .* *.egg build conf dist node_modules test_root cms/envs lms/envs
 python_classes =
@@ -67,7 +78,6 @@ ignore_imports =
     ############################################################################
     # lms side imports that we are ignoring for now
     lms.djangoapps.course_home_api.outline.tests.test_view -> cms.djangoapps.contentstore.outlines
-    lms.djangoapps.courseware.plugins -> cms.djangoapps.contentstore.utils
     lms.djangoapps.course_home_api.tests.utils -> cms.djangoapps.contentstore.outlines
     # lms.djangoapps.instructor.tests.test_api & lms.djangoapps.instructor.tests.test_tools
     #   -> openedx.core.djangoapps.course_date_signals.handlers
diff --git a/lms/djangoapps/badges/api/__init__.py b/test
similarity index 100%
rename from lms/djangoapps/badges/api/__init__.py
rename to test
diff --git a/tox.ini b/tox.ini
index 689407650699..3069c04ca4c7 100644
--- a/tox.ini
+++ b/tox.ini
@@ -26,10 +26,9 @@ setenv =
     PYTHONHASHSEED=0
     TOXENV={envname}
 passenv =
-    BOK_CHOY_CMS_PORT
-    BOKCHOY_HEADLESS
-    BOK_CHOY_HOSTNAME
-    BOK_CHOY_LMS_PORT
+    FRONTEND_TEST_SERVER_CMS_PORT
+    FRONTEND_TEST_SERVER_HOSTNAME
+    FRONTEND_TEST_SERVER_LMS_PORT
     DISABLE_COURSEENROLLMENT_HISTORY
     DISPLAY
     DJANGO_SETTINGS_MODULE
@@ -65,7 +64,7 @@ passenv =
     XDIST_WORKER_SECURITY_GROUP
     XDIST_WORKER_SUBNET
 commands_pre = make test-requirements
-whitelist_externals =
+allowlist_externals =
     /bin/bash
     /usr/bin/curl
     /bin/tar
diff --git a/webpack-config/file-lists.js b/webpack-config/file-lists.js
index ddb9cf4f7806..7167a6f5ddd8 100644
--- a/webpack-config/file-lists.js
+++ b/webpack-config/file-lists.js
@@ -99,9 +99,6 @@ module.exports = {
             '../openedx/features/course_search/static/course_search/js/views/dashboard_search_results_view.js'
         ),
         path.resolve(__dirname, '../openedx/features/course_search/static/course_search/js/views/search_results_view.js'),
-        path.resolve(__dirname, '../openedx/features/learner_profile/static/learner_profile/js/views/badge_list_container.js'),
-        path.resolve(__dirname, '../openedx/features/learner_profile/static/learner_profile/js/views/badge_list_view.js'),
-        path.resolve(__dirname, '../openedx/features/learner_profile/static/learner_profile/js/views/badge_view.js'),
         path.resolve(
             __dirname,
             '../openedx/features/learner_profile/static/learner_profile/js/views/learner_profile_fields.js'
diff --git a/xmodule/assets/video/_display.scss b/xmodule/assets/video/_display.scss
index 467c5960751e..2aea2bb24612 100644
--- a/xmodule/assets/video/_display.scss
+++ b/xmodule/assets/video/_display.scss
@@ -89,19 +89,14 @@ $cool-dark: rgb(79, 89, 93); // UXPL cool dark
     margin: 1em 0 0;
   }
 
-  .wrapper-downloads {
-    @include media-breakpoint-up(md) {
-      display: flex;
-    }
-
-    .hd {
-      margin: 0;
-    }
+  .wrapper-video-bottom-section {
+    display: flex;
 
     .wrapper-download-video,
     .wrapper-download-transcripts,
     .wrapper-handouts,
-    .branding {
+    .branding,
+    .wrapper-transcript-feedback {
       flex: 1;
       margin-top: $baseline;
 
@@ -109,6 +104,16 @@ $cool-dark: rgb(79, 89, 93); // UXPL cool dark
 
       vertical-align: top;
     }
+  }
+
+  .wrapper-downloads {
+    @include media-breakpoint-up(md) {
+      display: flex;
+    }
+
+    .hd {
+      margin: 0;
+    }
 
     .wrapper-download-video {
       .video-sources {
@@ -152,6 +157,22 @@ $cool-dark: rgb(79, 89, 93); // UXPL cool dark
         vertical-align: middle;
       }
     }
+
+  }
+
+  .wrapper-transcript-feedback {
+    .transcript-feedback-buttons {
+      display: flex;
+    }
+    .transcript-feedback-btn-wrapper {
+      margin-right: 10px;
+    }
+    .thumbs-up-btn,
+    .thumbs-down-btn {
+      border: none;
+      box-shadow: none;
+      background: transparent;
+    }
   }
 
   .video-wrapper {
diff --git a/xmodule/capa/safe_exec/tests/test_safe_exec.py b/xmodule/capa/safe_exec/tests/test_safe_exec.py
index 0f6429ec5e06..fa12e4f69903 100644
--- a/xmodule/capa/safe_exec/tests/test_safe_exec.py
+++ b/xmodule/capa/safe_exec/tests/test_safe_exec.py
@@ -18,6 +18,7 @@
 from six import unichr
 from six.moves import range
 
+from openedx.core.djangolib.testing.utils import skip_unless_lms
 from xmodule.capa.safe_exec import safe_exec, update_hash
 from xmodule.capa.safe_exec.remote_exec import is_codejail_rest_service_enabled
 
@@ -81,17 +82,30 @@ def test_raising_exceptions(self):
 
 
 class TestSafeOrNot(unittest.TestCase):  # lint-amnesty, pylint: disable=missing-class-docstring
+
+    @skip_unless_lms
     def test_cant_do_something_forbidden(self):
         '''
         Demonstrates that running unsafe code inside the code jail
         throws SafeExecException, protecting the calling process.
+
+        This test generally is skipped in CI due to its complex setup. That said, we recommend that devs who are
+        hacking on CodeJail or advanced CAPA in any significant way take the time to make sure it passes locally.
+        See either:
+        * in-platform setup: https://github.com/openedx/edx-platform/blob/master/xmodule/capa/safe_exec/README.rst
+        * remote setup (using Tutor): https://github.com/eduNEXT/tutor-contrib-codejail
+
+        Note on @skip_unless_lms:
+        This test can also be run in a CMS context, but that's giving us trouble in CI right now (the skip logic isn't
+        working). So, if you're running this locally, feel free to remove @skip_unless_lms and run it against CMS too.
         '''
-        # Can't test for forbiddenness if CodeJail isn't configured for python.
+        # If in-platform codejail isn't configured...
         if not jail_code.is_configured("python"):
 
-            # Can't test for forbiddenness if CodeJail rest service isn't enabled.
-            # Remote codejailservice must be running, see https://github.com/eduNEXT/tutor-contrib-codejail/
+            # ...AND if remote codejail isn't configured...
             if not is_codejail_rest_service_enabled():
+
+                # ...then skip this test.
                 pytest.skip(reason="Local or remote codejail has to be configured and enabled to run this test.")
 
         g = {}
diff --git a/xmodule/capa/tests/test_xqueue_interface.py b/xmodule/capa/tests/test_xqueue_interface.py
index 5fd913a15ec1..819fd73c798b 100644
--- a/xmodule/capa/tests/test_xqueue_interface.py
+++ b/xmodule/capa/tests/test_xqueue_interface.py
@@ -8,9 +8,11 @@
 from opaque_keys.edx.locator import BlockUsageLocator, CourseLocator
 from xblock.fields import ScopeIds
 
+from openedx.core.djangolib.testing.utils import skip_unless_lms
 from xmodule.capa.xqueue_interface import XQueueInterface, XQueueService
 
 
+@skip_unless_lms
 class XQueueServiceTest(TestCase):
     """Test the XQueue service methods."""
     def setUp(self):
diff --git a/xmodule/course_block.py b/xmodule/course_block.py
index bb08e252b0f7..ae6d88b7b7b5 100644
--- a/xmodule/course_block.py
+++ b/xmodule/course_block.py
@@ -619,14 +619,6 @@ class CourseFields:  # lint-amnesty, pylint: disable=missing-class-docstring
         # Ensure that courses imported from XML keep their image
         default="images_course_image.jpg"
     )
-    issue_badges = Boolean(
-        display_name=_("Issue Open Badges"),
-        help=_(
-            "Issue Open Badges badges for this course. Badges are generated when certificates are created."
-        ),
-        scope=Scope.settings,
-        default=True
-    )
     ## Course level Certificate Name overrides.
     cert_name_short = String(
         help=_(
diff --git a/xmodule/discussion_block.py b/xmodule/discussion_block.py
index b5c5c01907c4..943c6359dd16 100644
--- a/xmodule/discussion_block.py
+++ b/xmodule/discussion_block.py
@@ -12,8 +12,8 @@
 from xblock.completable import XBlockCompletionMode
 from xblock.core import XBlock
 from xblock.fields import UNIQUE_ID, Scope, String
-from xblockutils.resources import ResourceLoader
-from xblockutils.studio_editable import StudioEditableXBlockMixin
+from xblock.utils.resources import ResourceLoader
+from xblock.utils.studio_editable import StudioEditableXBlockMixin
 
 from lms.djangoapps.discussion.django_comment_client.permissions import has_permission
 from openedx.core.djangoapps.discussions.models import DiscussionsConfiguration, Provider
diff --git a/xmodule/js/fixtures/video_all.html b/xmodule/js/fixtures/video_all.html
index bd166720589a..280fc4db35f4 100644
--- a/xmodule/js/fixtures/video_all.html
+++ b/xmodule/js/fixtures/video_all.html
@@ -33,48 +33,49 @@
 
           <div class="focus_grabber last"></div>
 
-          <h3 class="hd hd-4 downloads-heading sr" id="video-download-transcripts">Downloads and transcripts</h3>
-          <div class="wrapper-downloads" role="region" aria-labelledby="video-download-transcripts">
-            <div class="wrapper-download-video">
-              <h4 class="hd hd-5">Video</h4>
-              <div class="wrapper-social-share" data-url="video-share-url">
-                <span class="icon fa fa-share-alt" aria-hidden="true"></span>
-                Share on:
-                <a class="btn-link social-share-link" data-source="twitter" href="#">
+          <div class="wrapper-video-bottom-section">
+            <h3 class="hd hd-4 downloads-heading sr" id="video-download-transcripts">Downloads and transcripts</h3>
+            <div class="wrapper-downloads" role="region" aria-labelledby="video-download-transcripts">
+              <div class="wrapper-download-video">
+                <h4 class="hd hd-5">Video</h4>
+                <div class="wrapper-social-share" data-url="video-share-url">
+                  <span class="icon fa fa-share-alt" aria-hidden="true"></span>
+                  Share on:
+                  <a class="btn-link social-share-link" data-source="twitter" href="#">
+                      <span class="icon fa fa-linkedin-square" aria-hidden="true"></span>
+                      <span class="sr">Share on twitter</span>
+                  </a>
+                  <a class="btn-link social-share-link" data-source="facebook" href="#">
                     <span class="icon fa fa-linkedin-square" aria-hidden="true"></span>
-                    <span class="sr">Share on twitter</span>
-                </a>
-                <a class="btn-link social-share-link" data-source="facebook" href="#">
-                  <span class="icon fa fa-linkedin-square" aria-hidden="true"></span>
-                  <span class="sr">Share on facebook</span>
-                </a>
-                <a class="btn-link social-share-link" data-source="linkedin" href="#">
-                  <span class="icon fa fa-linkedin-square" aria-hidden="true"></span>
-                  <span class="sr">Share on linkedin</span>
+                    <span class="sr">Share on facebook</span>
+                  </a>
+                  <a class="btn-link social-share-link" data-source="linkedin" href="#">
+                    <span class="icon fa fa-linkedin-square" aria-hidden="true"></span>
+                    <span class="sr">Share on linkedin</span>
+                  </a>
+                </div>
+                <a class="btn-link video-sources video-download-button" href="#">
+                    Download video file
                 </a>
               </div>
-              <a class="btn-link video-sources video-download-button" href="#">
-                  Download video file
-              </a>
-            </div>
-            <div class="wrapper-download-transcripts">
-              <h4 class="hd hd-5">Transcripts</h4>
-              <ul class="list-download-transcripts">
-                <li class="transcript-option">
-                  <a href="#" class="btn btn-link" data-href="txt">Download Text (.txt) file</a>
-                </li>
-                <li class="transcript-option">
-                  <a href="#" class="btn btn-link" data-href="srt">Download SubRip (.srt) file</a>
-                </li>
-              </ul>
-              <a href="#" class="external-track">Download transcript</a>
-            </div>
-            <div class="wrapper-handouts">
-              <h4 class="hd hd-5">Handouts</h4>
-              <a href="#">Download Handout</a>
+              <div class="wrapper-download-transcripts">
+                <h4 class="hd hd-5">Transcripts</h4>
+                <ul class="list-download-transcripts">
+                  <li class="transcript-option">
+                    <a href="#" class="btn btn-link" data-href="txt">Download Text (.txt) file</a>
+                  </li>
+                  <li class="transcript-option">
+                    <a href="#" class="btn btn-link" data-href="srt">Download SubRip (.srt) file</a>
+                  </li>
+                </ul>
+                <a href="#" class="external-track">Download transcript</a>
+              </div>
+              <div class="wrapper-handouts">
+                <h4 class="hd hd-5">Handouts</h4>
+                <a href="#">Download Handout</a>
+              </div>
             </div>
           </div>
-
         </div>
       </div>
     </div>
diff --git a/xmodule/js/fixtures/video_transcript_feedback.html b/xmodule/js/fixtures/video_transcript_feedback.html
new file mode 100644
index 000000000000..3ba5f0dae785
--- /dev/null
+++ b/xmodule/js/fixtures/video_transcript_feedback.html
@@ -0,0 +1,57 @@
+<div class="course-content">
+  <div class="vert-mod">
+    <div id="video_example">
+      <div id="example">
+        <div
+          id="video_id"
+          class="video closed vert vert-video_id"
+          data-block-id="block-v1:coursekey+type@video+block@000000000000000000"
+          data-course-id="course-v1:someOrg+thisCOurse+runAway"
+          data-metadata='{"autohideHtml5": "true", "autoplay": "false", "captionDataDir": "", "endTime": "", "generalSpeed": "1.0", "saveStateUrl": "/save_user_state", "savedVideoPosition": "0", "showCaptions": "true", "sources": ["/base/fixtures/test.mp4","/base/fixtures/test.webm","/base/fixtures/test.ogv"], "speed": "1.5", "startTime": "", "streams": "", "sub": "Z5KLxerq05Y", "transcriptAvailableTranslationsUrl": "/transcript/available_translations", "transcriptLanguage": "en", "transcriptLanguages": {"en": "English", "de": "Deutsch", "zh": "普通话"}, "transcriptTranslationUrl": "/transcript/translation/__lang__", "ytApiUrl": "/base/fixtures/youtube_iframe_api.js", "ytImageUrl": "", "ytTestTimeout": "1500", "ytMetadataUrl": "www.googleapis.com/youtube/v3/videos/"}'
+        >
+          <div class="focus_grabber first"></div>
+
+          <div class="tc-wrapper">
+            <article class="video-wrapper">
+              <span tabindex="0" class="spinner" aria-hidden="false" aria-label="Loading video player"></span>
+              <span tabindex="-1" class="btn-play fa fa-youtube-play fa-2x is-hidden" aria-hidden="true" aria-label="Play video"></span>
+              <div class="video-player-pre"></div>
+              <section class="video-player">
+                <div id="id"></div>
+              </section>
+              <div class="video-player-post"></div>
+              <div class="closed-captions"></div>
+              <section class="video-controls is-hidden">
+                <div class="slider"></div>
+                <div>
+                  <div class="vcr"><div class="vidtime">0:00 / 0:00</div></div>
+                  <div class="secondary-controls"></div>
+                </div>
+              </section>
+            </article>
+          </div>
+
+          <div class="focus_grabber last"></div>
+
+          <div class="wrapper-video-bottom-section">
+            <div class="wrapper-transcript-feedback" data-video-id='365b710a-6dd6-11ee-b962-0242ac120002' data-user-id='1'>
+              <h4 class="hd hd-5">How is the transcript quality ?</h4>
+              <div class="transcript-feedback-buttons">
+                  <div class="transcript-feedback-btn-wrapper">
+                      <button class="thumbs-up-btn">
+                          <span class="icon fa fa-thumbs-o-up thumbs-up-icon"></span>
+                      </button>
+                  </div>
+                  <div class="transcript-feedback-btn-wrapper">
+                      <button class="thumbs-down-btn">
+                          <span class="icon fa fa-thumbs-o-down thumbs-down-icon"></span>
+                      </button>
+                  </div>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+</div>
diff --git a/xmodule/js/karma_runner_webpack.js b/xmodule/js/karma_runner_webpack.js
index bb29b1c6f2e8..6dfee7db9e7d 100644
--- a/xmodule/js/karma_runner_webpack.js
+++ b/xmodule/js/karma_runner_webpack.js
@@ -46,6 +46,7 @@ import './spec/video/initialize_spec.js';
 import './spec/video/iterator_spec.js';
 import './spec/video/resizer_spec.js';
 import './spec/video/sjson_spec.js';
+import './spec/video/social_share_spec.js';
 import './spec/video/video_autoadvance_spec.js';
 import './spec/video/video_bumper_spec.js';
 import './spec/video/video_caption_spec.js';
@@ -66,9 +67,9 @@ import './spec/video/video_save_state_plugin_spec.js';
 import './spec/video/video_skip_control_spec.js';
 import './spec/video/video_speed_control_spec.js';
 import './spec/video/video_storage_spec.js';
+import './spec/video/video_transcript_feedback_spec.js';
 import './spec/video/video_volume_control_spec.js';
 import './spec/time_spec.js';
-import './spec/video/social_share_spec.js';
 
 // overwrite the loaded method and manually start the karma after a delay
 // Somehow the code initialized in jQuery's onready doesn't get called before karma auto starts
diff --git a/xmodule/js/spec/helper.js b/xmodule/js/spec/helper.js
index 978de6785ed9..d7a019e07caf 100644
--- a/xmodule/js/spec/helper.js
+++ b/xmodule/js/spec/helper.js
@@ -180,6 +180,38 @@
                 return {};
             } else if (settings.url === '/save_user_state') {
                 return {success: true};
+            } else if (settings.url.match(/.+video-transcript.+$/)) {
+                if (settings.url.match(/.+&video_uuid=notAIGenerated/)) {
+                    return settings.success(null);
+                }
+                if (settings.url.match(/.+&video_uuid=inProgress/)) {
+                    return settings.success({
+                        status: 'In Progress'
+                    });
+                }
+                if (settings.url.match(/.+&video_uuid=error/)) {
+                    return settings.error();
+                }
+                return settings.success({
+                    status: 'Completed'
+                });
+            } else if (settings.url.match(/.+transcript-feedback.+$/) && settings.type === 'GET') {
+                if (settings.url.match(/.+&video_uuid=error.+$/)) {
+                    return settings.error();
+                }
+                if (settings.url.match(/.+&video_uuid=negative.+$/)) {
+                    return settings.success({
+                        value: false
+                    });
+                }
+                if (settings.url.match(/.+&video_uuid=none.+$/)) {
+                    return settings.success(null);
+                }
+                return settings.success({
+                    value: true
+                });
+            } else if (settings.url.match(/.+transcript-feedback.+$/) && settings.type === 'POST') {
+                return settings.success(settings.data.value !== null ? { value: settings.data.value } : null);
             } else if (settings.url.match(new RegExp(jasmine.getFixtures().fixturesPath + '.+', 'g'))) {
                 return origAjax(settings);
             } else {
diff --git a/xmodule/js/spec/video/video_caption_spec.js b/xmodule/js/spec/video/video_caption_spec.js
index 6bd9a307dc88..58fcc1cce99d 100644
--- a/xmodule/js/spec/video/video_caption_spec.js
+++ b/xmodule/js/spec/video/video_caption_spec.js
@@ -833,7 +833,7 @@
                 });
             });
 
-            msg = 'on succes: language menu is rendered if translations available';
+            msg = 'on success: language menu is rendered if translations available';
             it(msg, function() {
                 state.config.transcriptLanguages = {
                     en: 'English',
@@ -853,7 +853,7 @@
                 });
             });
 
-            msg = 'on succes: language menu isn\'t rendered if translations unavailable';
+            msg = 'on success: language menu isn\'t rendered if translations unavailable';
             it(msg, function() {
                 state.config.transcriptLanguages = {
                     en: 'English',
diff --git a/xmodule/js/spec/video/video_transcript_feedback_spec.js b/xmodule/js/spec/video/video_transcript_feedback_spec.js
new file mode 100644
index 000000000000..234f92138487
--- /dev/null
+++ b/xmodule/js/spec/video/video_transcript_feedback_spec.js
@@ -0,0 +1,271 @@
+(function() {
+    // eslint-disable-next-line lines-around-directive
+    'use strict';
+
+    describe('VideoTranscriptFeedback', function() {
+        var state;
+        var videoId = "365b710a-6dd6-11ee-b962-0242ac120002";
+        var userId = 1;
+        var currentLanguage = "en";
+        var getAITranscriptUrl = '/video-transcript' + '?transcript_language=' + currentLanguage + '&video_uuid=' + videoId;
+        var getTranscriptFeedbackUrl = '/transcript-feedback' + '?transcript_language=' + currentLanguage + '&video_uuid=' + videoId + '&user_id=' + userId;
+        var sendTranscriptFeedbackUrl = '/transcript-feedback/';
+
+        beforeEach(function() {
+            state = jasmine.initializePlayer('video_transcript_feedback.html');
+        });
+
+        afterEach(function() {
+            $('source').remove();
+            state.storage.clear();
+            if (state.videoPlayer) {
+                state.videoPlayer.destroy();
+            }
+        });
+
+        describe('initialize', function() {
+            it('instantiates widget and handlers along with necessary data', function() {
+                spyOn(state.videoTranscriptFeedback, 'loadAndSetVisibility').and.callFake(function() {
+                    return true;
+                });
+                spyOn(state.videoTranscriptFeedback, 'bindHandlers').and.callFake(function() {
+                    return true;
+                });
+                state.videoTranscriptFeedback.initialize();
+
+                expect(state.videoTranscriptFeedback.videoId).toEqual(videoId);
+                expect(state.videoTranscriptFeedback.userId).toEqual(userId);
+                expect(state.videoTranscriptFeedback.currentTranscriptLanguage).toEqual(currentLanguage);
+                expect(state.videoTranscriptFeedback.loadAndSetVisibility).toHaveBeenCalled();
+                expect(state.videoTranscriptFeedback.bindHandlers).toHaveBeenCalled();
+            });
+        });
+
+        describe('should show widget', function() {
+            it('checks if transcript was AI generated', function() {
+                spyOn(state.videoTranscriptFeedback, 'loadAndSetVisibility').and.callThrough();
+                state.videoTranscriptFeedback.loadAndSetVisibility();
+
+                var getAITranscriptCall = $.ajax.calls.all().find(function(call) {
+                    return call.args[0].url.match(/.+video-transcript.+$/);
+                });
+
+                expect(state.videoTranscriptFeedback.loadAndSetVisibility).toHaveBeenCalled();
+                expect(getAITranscriptCall.args[0].url).toEqual(state.videoTranscriptFeedback.aiTranslationsUrl + getAITranscriptUrl);
+                expect(getAITranscriptCall.args[0].type).toEqual('GET');
+                expect(getAITranscriptCall.args[0].async).toEqual(false);
+                expect(getAITranscriptCall.args[0].success).toEqual(jasmine.any(Function));
+                expect(getAITranscriptCall.args[0].error).toEqual(jasmine.any(Function));
+            });
+            it('shows widget if transcript is AI generated', function() {
+                state.videoTranscriptFeedback.loadAndSetVisibility();
+                expect($('.wrapper-transcript-feedback')[0]).toExist();
+            });
+            it('hides widget if transcript is not AI generated', function() {
+                state.videoTranscriptFeedback.videoId = 'notAIGenerated';
+                state.videoTranscriptFeedback.loadAndSetVisibility();
+                expect($('.wrapper-transcript-feedback')[0]).toExist();
+                expect($('.wrapper-transcript-feedback')[0].style.display).toEqual('none');
+            });
+            it('hides widget if transcript is AI generated but is still in progress', function() {
+                state.videoTranscriptFeedback.videoId = 'inProgress';
+                state.videoTranscriptFeedback.loadAndSetVisibility();
+                expect($('.wrapper-transcript-feedback')[0]).toExist();
+                expect($('.wrapper-transcript-feedback')[0].style.display).toEqual('none');
+            });
+            it('hides widget if query for transcript AI generated fails', function() {
+                state.videoTranscriptFeedback.videoId = 'error';
+                state.videoTranscriptFeedback.loadAndSetVisibility();
+                expect($('.wrapper-transcript-feedback')[0]).toExist();
+                expect($('.wrapper-transcript-feedback')[0].style.display).toEqual('none');
+            });
+            it('checks if feedback exists for AI generated transcript', function() {
+                spyOn(state.videoTranscriptFeedback, 'getFeedbackForCurrentTranscript').and.callThrough();
+                state.videoTranscriptFeedback.loadAndSetVisibility();
+
+                var getTranscriptFeedbackCall = $.ajax.calls.all().find(function(call) {
+                    return call.args[0].url.match(/.+transcript-feedback.+$/);
+                });
+
+                expect(state.videoTranscriptFeedback.getFeedbackForCurrentTranscript).toHaveBeenCalled();
+                expect(getTranscriptFeedbackCall.args[0].url).toEqual(state.videoTranscriptFeedback.aiTranslationsUrl + getTranscriptFeedbackUrl);
+                expect(getTranscriptFeedbackCall.args[0].type).toEqual('GET');
+                expect(getTranscriptFeedbackCall.args[0].success).toEqual(jasmine.any(Function));
+                expect(getTranscriptFeedbackCall.args[0].error).toEqual(jasmine.any(Function));
+            });
+        });
+
+        describe('get feedback for current transcript', function() {
+            it('marks thumbs up button if feedback exists and it is positive', function() {
+                state.videoTranscriptFeedback.getFeedbackForCurrentTranscript();
+                var thumbsUpIcon = $('.thumbs-up-icon')[0];
+                var thumbsDownIcon = $('.thumbs-down-icon')[0];
+
+
+                expect(thumbsUpIcon.classList).toContain('fa-thumbs-up');
+                expect(thumbsDownIcon.classList).toContain('fa-thumbs-o-down');
+                expect(state.videoTranscriptFeedback.currentFeedback).toEqual(true);
+            });
+            it('marks thumbs down button if feedback exists and it is negative', function() {
+                state.videoTranscriptFeedback.videoId = 'negative';
+                state.videoTranscriptFeedback.getFeedbackForCurrentTranscript();
+
+                var thumbsUpIcon = $('.thumbs-up-icon')[0];
+                var thumbsDownIcon = $('.thumbs-down-icon')[0];
+
+                expect(thumbsUpIcon.classList).toContain('fa-thumbs-o-up');
+                expect(thumbsDownIcon.classList).toContain('fa-thumbs-down');
+                expect(state.videoTranscriptFeedback.currentFeedback).toEqual(false);
+            });
+            it('marks thumbs up buttons as empty if feedback does not exist', function() {
+                state.videoTranscriptFeedback.videoId = 'none';
+                state.videoTranscriptFeedback.getFeedbackForCurrentTranscript();
+
+                var thumbsUpIcon = $('.thumbs-up-icon')[0];
+                var thumbsDownIcon = $('.thumbs-down-icon')[0];
+
+                expect(thumbsUpIcon.classList).toContain('fa-thumbs-o-up');
+                expect(thumbsDownIcon.classList).toContain('fa-thumbs-o-down');
+                expect(state.videoTranscriptFeedback.currentFeedback).toEqual(null);
+            });
+            it('marks thumbs up buttons as empty if query fails', function() {
+                state.videoTranscriptFeedback.videoId = 'error';
+                state.videoTranscriptFeedback.getFeedbackForCurrentTranscript();
+
+                var thumbsUpIcon = $('.thumbs-up-icon')[0];
+                var thumbsDownIcon = $('.thumbs-down-icon')[0];
+
+                expect(thumbsUpIcon.classList).toContain('fa-thumbs-o-up');
+                expect(thumbsDownIcon.classList).toContain('fa-thumbs-o-down');
+                expect(state.videoTranscriptFeedback.currentFeedback).toEqual(null);
+            });
+        });
+
+        describe('onHideLanguageMenu', function() {
+            it('calls loadAndSetVisibility if language changed', function() {
+                state.videoTranscriptFeedback.currentTranscriptLanguage = 'es';
+                spyOn(state.videoTranscriptFeedback, 'loadAndSetVisibility').and.callThrough();
+                state.el.trigger('language_menu:hide', {
+                    id: 'id',
+                    code: 'code',
+                    language: 'en',
+                    duration: 10
+                });
+                expect(state.videoTranscriptFeedback.loadAndSetVisibility).toHaveBeenCalled();
+            });
+            it('does not call loadAndSetVisibility if language did not change', function() {
+                state.videoTranscriptFeedback.currentTranscriptLanguage = 'en';
+                spyOn(state.videoTranscriptFeedback, 'loadAndSetVisibility').and.callThrough();
+                state.el.trigger('language_menu:hide', {
+                    id: 'id',
+                    code: 'code',
+                    language: 'en',
+                    duration: 10
+                });
+                expect(state.videoTranscriptFeedback.loadAndSetVisibility).not.toHaveBeenCalled();
+            });
+        });
+
+        describe('clicking on thumbs up button', function() {
+            it('sends positive feedback if there is no current feedback', function() {
+                state.videoTranscriptFeedback.loadAndSetVisibility();
+                state.videoTranscriptFeedback.currentFeedback = undefined;
+                spyOn(state.videoTranscriptFeedback, 'sendFeedbackForCurrentTranscript').and.callFake(function() {
+                    return true;
+                });
+                var thumbsUpButton = $('.thumbs-up-btn');
+                thumbsUpButton.trigger('click');
+                expect(state.videoTranscriptFeedback.sendFeedbackForCurrentTranscript).toHaveBeenCalledWith(true);
+            });
+            it('sends empty feedback if there is a current positive feedback', function() {
+                state.videoTranscriptFeedback.loadAndSetVisibility();
+                state.videoTranscriptFeedback.currentFeedback = true;
+                spyOn(state.videoTranscriptFeedback, 'sendFeedbackForCurrentTranscript').and.callFake(function() {
+                    return true;
+                });
+                var thumbsUpButton = $('.thumbs-up-btn');
+                thumbsUpButton.trigger('click');
+                expect(state.videoTranscriptFeedback.sendFeedbackForCurrentTranscript).toHaveBeenCalledWith(null);
+            });
+        });
+
+        describe('clicking on thumbs down button', function() {
+            it('sends negative feedback if there is no current feedback', function() {
+                state.videoTranscriptFeedback.loadAndSetVisibility();
+                state.videoTranscriptFeedback.currentFeedback = undefined;
+                spyOn(state.videoTranscriptFeedback, 'sendFeedbackForCurrentTranscript').and.callFake(function() {
+                    return true;
+                });
+                var thumbsDownButton = $('.thumbs-down-btn');
+                thumbsDownButton.trigger('click');
+                expect(state.videoTranscriptFeedback.sendFeedbackForCurrentTranscript).toHaveBeenCalledWith(false);
+            });
+            it('sends empty feedback if there is a current negative feedback', function() {
+                state.videoTranscriptFeedback.loadAndSetVisibility();
+                state.videoTranscriptFeedback.currentFeedback = false;
+                spyOn(state.videoTranscriptFeedback, 'sendFeedbackForCurrentTranscript').and.callFake(function() {
+                    return true;
+                });
+                var thumbsDownButton = $('.thumbs-down-btn');
+                thumbsDownButton.trigger('click');
+                expect(state.videoTranscriptFeedback.sendFeedbackForCurrentTranscript).toHaveBeenCalledWith(null);
+            });
+        });
+
+        describe('calling send transcript feedback', function() {
+            it('sends proper request to ai translation service', function() {
+                state.videoTranscriptFeedback.loadAndSetVisibility();
+                state.videoTranscriptFeedback.currentFeedback = undefined;
+                state.videoTranscriptFeedback.sendFeedbackForCurrentTranscript(true);
+                var sendTranscriptFeedbackCall = $.ajax.calls.all().find(function(call) {
+                    return call.args[0].url.match(/.+transcript-feedback.+$/) && call.args[0].type === 'POST';
+                });
+
+                expect(sendTranscriptFeedbackCall.args[0].url).toEqual(state.videoTranscriptFeedback.aiTranslationsUrl + sendTranscriptFeedbackUrl);
+                expect(sendTranscriptFeedbackCall.args[0].type).toEqual('POST');
+                expect(sendTranscriptFeedbackCall.args[0].dataType).toEqual('json');
+                expect(sendTranscriptFeedbackCall.args[0].data).toEqual({
+                    transcript_language: currentLanguage,
+                    video_uuid: videoId,
+                    user_id: userId,
+                    value: true,
+                });
+                expect(sendTranscriptFeedbackCall.args[0].success).toEqual(jasmine.any(Function));
+                expect(sendTranscriptFeedbackCall.args[0].error).toEqual(jasmine.any(Function));
+            });
+            it('marks thumbs up button as selected if response is positive', function() {
+                state.videoTranscriptFeedback.loadAndSetVisibility();
+                state.videoTranscriptFeedback.currentFeedback = undefined;
+                state.videoTranscriptFeedback.sendFeedbackForCurrentTranscript(true);
+                var thumbsUpIcon = $('.thumbs-up-icon')[0];
+                var thumbsDownIcon = $('.thumbs-down-icon')[0];
+
+                expect(thumbsUpIcon.classList).toContain('fa-thumbs-up');
+                expect(thumbsDownIcon.classList).toContain('fa-thumbs-o-down');
+                expect(state.videoTranscriptFeedback.currentFeedback).toEqual(true);
+            });
+            it('marks thumbs down button as selected if response is negative', function() {
+                state.videoTranscriptFeedback.loadAndSetVisibility();
+                state.videoTranscriptFeedback.currentFeedback = undefined;
+                state.videoTranscriptFeedback.sendFeedbackForCurrentTranscript(false);
+                var thumbsUpIcon = $('.thumbs-up-icon')[0];
+                var thumbsDownIcon = $('.thumbs-down-icon')[0];
+
+                expect(thumbsUpIcon.classList).toContain('fa-thumbs-o-up');
+                expect(thumbsDownIcon.classList).toContain('fa-thumbs-down');
+                expect(state.videoTranscriptFeedback.currentFeedback).toEqual(false);
+            });
+            it('unselects thumbs buttons if response is empty', function() {
+                state.videoTranscriptFeedback.loadAndSetVisibility();
+                state.videoTranscriptFeedback.currentFeedback = true;
+                state.videoTranscriptFeedback.sendFeedbackForCurrentTranscript(null);
+                var thumbsUpIcon = $('.thumbs-up-icon')[0];
+                var thumbsDownIcon = $('.thumbs-down-icon')[0];
+
+                expect(thumbsUpIcon.classList).toContain('fa-thumbs-o-up');
+                expect(thumbsDownIcon.classList).toContain('fa-thumbs-o-down');
+                expect(state.videoTranscriptFeedback.currentFeedback).toEqual(null);
+            });
+        });
+    });
+}).call(this);
diff --git a/xmodule/js/src/video/037_video_transcript_feedback.js b/xmodule/js/src/video/037_video_transcript_feedback.js
new file mode 100644
index 000000000000..e369c1c11153
--- /dev/null
+++ b/xmodule/js/src/video/037_video_transcript_feedback.js
@@ -0,0 +1,247 @@
+(function(define) {
+    // VideoTranscriptFeedbackHandler module.
+
+        'use strict';
+
+        define('video/037_video_caption.js', ['underscore'],
+        function(_) {
+            /**
+             * @desc VideoTranscriptFeedbackHandler module exports a function.
+             *
+             * @type {function}
+             * @access public
+             *
+             * @param {object} state - The object containing the state of the video
+             *     player. All other modules, their parameters, public variables, etc.
+             *     are available via this object.
+             *
+             * @this {object} The global window object.
+             *
+             */
+
+            var VideoTranscriptFeedbackHandler = function(state) {
+                if (!(this instanceof VideoTranscriptFeedbackHandler)) {
+                    return new VideoTranscriptFeedbackHandler(state);
+                }
+
+                _.bindAll(this,  'destroy', 'getFeedbackForCurrentTranscript', 'markAsPositiveFeedback', 'markAsNegativeFeedback', 'markAsEmptyFeedback',
+                    'selectThumbsUp', 'selectThumbsDown', 'unselectThumbsUp', 'unselectThumbsDown', 'thumbsUpClickHandler', 'thumbsDownClickHandler',
+                    'sendFeedbackForCurrentTranscript', 'onHideLanguageMenu', 'getCurrentLanguage', 'loadAndSetVisibility', 'showWidget', 'hideWidget'
+                );
+
+                this.state = state;
+                this.state.videoTranscriptFeedback = this;
+                this.currentTranscriptLanguage = this.state.lang;
+                this.transcriptLanguages = this.state.config.transcriptLanguages;
+
+                if (this.state.el.find('.wrapper-transcript-feedback').length) {
+                    this.initialize();
+                }
+
+                return false;
+            };
+
+            VideoTranscriptFeedbackHandler.prototype = {
+
+                destroy: function() {
+                    this.state.el.off(this.events);
+                },
+
+                // Initializes the module.
+                initialize: function() {
+                    this.el = this.state.el.find('.wrapper-transcript-feedback');
+
+                    this.videoId = this.el.data('video-id');
+                    this.userId = this.el.data('user-id');
+                    this.aiTranslationsUrl = this.state.config.aiTranslationsUrl;
+
+                    this.thumbsUpButton = this.el.find('.thumbs-up-btn');
+                    this.thumbsDownButton = this.el.find('.thumbs-down-btn');
+                    this.thumbsUpButton.on('click', this.thumbsUpClickHandler);
+                    this.thumbsDownButton.on('click', this.thumbsDownClickHandler);
+
+                    this.events = {
+                        'language_menu:hide': this.onHideLanguageMenu,
+                        destroy: this.destroy
+                    };
+                    this.loadAndSetVisibility();
+                    this.bindHandlers();
+                },
+
+                bindHandlers: function() {
+                    this.state.el.on(this.events);
+                },
+
+                getFeedbackForCurrentTranscript: function() {
+                    var self = this;
+                    var url = self.aiTranslationsUrl + '/transcript-feedback' + '?transcript_language=' + self.currentTranscriptLanguage + '&video_uuid=' + self.videoId + '&user_id=' + self.userId;
+
+                    $.ajax({
+                        url: url,
+                        type: 'GET',
+                        success: function(data) {
+                            if (data && data.value === true) {
+                                self.markAsPositiveFeedback();
+                                self.currentFeedback = true;
+                            } else {
+                                if (data && data.value === false) {
+                                    self.markAsNegativeFeedback();
+                                    self.currentFeedback = false;
+                                } else {
+                                    self.markAsEmptyFeedback();
+                                    self.currentFeedback = null;
+                                }
+                            }
+                        },
+                        error: function(error) {
+                            self.markAsEmptyFeedback();
+                            self.currentFeedback = null;
+                        }
+                    });
+                },
+
+                markAsPositiveFeedback: function() {
+                    this.selectThumbsUp();
+                    this.unselectThumbsDown();
+                },
+
+                markAsNegativeFeedback: function() {
+                    this.selectThumbsDown();
+                    this.unselectThumbsUp();
+                },
+
+                markAsEmptyFeedback: function() {
+                    this.unselectThumbsUp();
+                    this.unselectThumbsDown();
+                },
+
+                selectThumbsUp: function() {
+                    var thumbsUpIcon = this.thumbsUpButton.find('.thumbs-up-icon');
+                    if (thumbsUpIcon[0].classList.contains('fa-thumbs-o-up')) {
+                        thumbsUpIcon[0].classList.remove("fa-thumbs-o-up");
+                        thumbsUpIcon[0].classList.add("fa-thumbs-up");
+                    }
+                },
+
+                selectThumbsDown: function() {
+                    var thumbsDownIcon = this.thumbsDownButton.find('.thumbs-down-icon');
+                    if (thumbsDownIcon[0].classList.contains('fa-thumbs-o-down')) {
+                        thumbsDownIcon[0].classList.remove("fa-thumbs-o-down");
+                        thumbsDownIcon[0].classList.add("fa-thumbs-down");
+                    }
+                },
+
+                unselectThumbsUp: function() {
+                    var thumbsUpIcon = this.thumbsUpButton.find('.thumbs-up-icon');
+                    if (thumbsUpIcon[0].classList.contains('fa-thumbs-up')) {
+                        thumbsUpIcon[0].classList.remove("fa-thumbs-up");
+                        thumbsUpIcon[0].classList.add("fa-thumbs-o-up");
+                    }
+                },
+
+                unselectThumbsDown: function() {
+                    var thumbsDownIcon = this.thumbsDownButton.find('.thumbs-down-icon');
+                    if (thumbsDownIcon[0].classList.contains('fa-thumbs-down')) {
+                        thumbsDownIcon[0].classList.remove("fa-thumbs-down");
+                        thumbsDownIcon[0].classList.add("fa-thumbs-o-down");
+                    }
+                },
+
+                thumbsUpClickHandler: function() {
+                    if (this.currentFeedback) {
+                        this.sendFeedbackForCurrentTranscript(null);
+                    } else {
+                        this.sendFeedbackForCurrentTranscript(true);
+                    }
+                },
+
+                thumbsDownClickHandler: function() {
+                    if (this.currentFeedback === false) {
+                        this.sendFeedbackForCurrentTranscript(null);
+                    } else {
+                        this.sendFeedbackForCurrentTranscript(false);
+                    }
+                },
+
+                sendFeedbackForCurrentTranscript: function(feedbackValue) {
+                    var self = this;
+                    var url = self.aiTranslationsUrl + '/transcript-feedback/';
+                    $.ajax({
+                        url: url,
+                        type: 'POST',
+                        dataType: 'json',
+                        data: {
+                            transcript_language: self.currentTranscriptLanguage,
+                            video_uuid: self.videoId,
+                            user_id: self.userId,
+                            value: feedbackValue,
+                        },
+                        success: function(data) {
+                            if (data && data.value === true) {
+                                self.markAsPositiveFeedback();
+                                self.currentFeedback = true;
+                            } else {
+                                if (data && data.value === false) {
+                                    self.markAsNegativeFeedback();
+                                    self.currentFeedback = false;
+                                } else {
+                                    self.markAsEmptyFeedback();
+                                    self.currentFeedback = null;
+                                }
+                            }
+                        },
+                        error: function() {
+                            self.markAsEmptyFeedback();
+                            self.currentFeedback = null;
+                        }
+                    });
+                },
+
+                onHideLanguageMenu: function() {
+                    var newLanguageSelected = this.getCurrentLanguage();
+                    if (this.currentTranscriptLanguage !== newLanguageSelected) {
+                        this.currentTranscriptLanguage = this.getCurrentLanguage();
+                        this.loadAndSetVisibility();
+                    }
+                },
+
+                getCurrentLanguage: function() {
+                    var language = this.state.lang;
+                    return language;
+                },
+
+                loadAndSetVisibility: function() {
+                    var self = this;
+                    var url = self.aiTranslationsUrl + '/video-transcript' + '?transcript_language=' + self.currentTranscriptLanguage + '&video_uuid=' + self.videoId;
+
+                    $.ajax({
+                        url: url,
+                        type: 'GET',
+                        async: false,
+                        success: function(data) {
+                            if (data && data.status === 'Completed') {
+                                self.showWidget();
+                                self.getFeedbackForCurrentTranscript();
+                            } else {
+                                self.hideWidget();
+                            }
+                        },
+                        error: function(error) {
+                            self.hideWidget();
+                        }
+                    });
+                },
+
+                showWidget: function() {
+                    this.el.show();
+                },
+
+                hideWidget: function() {
+                    this.el.hide();
+                },
+
+            };
+
+            return VideoTranscriptFeedbackHandler;
+        });
+}(RequireJS.define));
diff --git a/xmodule/js/src/video/10_main.js b/xmodule/js/src/video/10_main.js
index e1c8753ed255..35e9680b4ec1 100644
--- a/xmodule/js/src/video/10_main.js
+++ b/xmodule/js/src/video/10_main.js
@@ -65,14 +65,15 @@
             'video/09_completion.js',
             'video/10_commands.js',
             'video/095_video_context_menu.js',
-            'video/036_video_social_sharing.js'
+            'video/036_video_social_sharing.js',
+            'video/037_video_transcript_feedback.js'
         ],
         function(
             VideoStorage, initialize, FocusGrabber, VideoAccessibleMenu, VideoControl, VideoFullScreen,
             VideoQualityControl, VideoProgressSlider, VideoVolumeControl, VideoSpeedControl, VideoAutoAdvanceControl,
             VideoCaption, VideoPlayPlaceholder, VideoPlayPauseControl, VideoPlaySkipControl, VideoSkipControl,
             VideoBumper, VideoSaveStatePlugin, VideoEventsPlugin, VideoEventsBumperPlugin, VideoPoster,
-            VideoCompletionHandler, VideoCommands, VideoContextMenu, VideoSocialSharing
+            VideoCompletionHandler, VideoCommands, VideoContextMenu, VideoSocialSharing, VideoTranscriptFeedback
         ) {
             /* RequireJS */
             var youtubeXhr = null,
@@ -92,10 +93,10 @@
                         FocusGrabber, VideoControl, VideoPlayPlaceholder,
                         VideoPlayPauseControl, VideoProgressSlider, VideoSpeedControl,
                         VideoVolumeControl, VideoQualityControl, VideoFullScreen, VideoCaption, VideoCommands,
-                        VideoContextMenu, VideoSaveStatePlugin, VideoEventsPlugin, VideoCompletionHandler
+                        VideoContextMenu, VideoSaveStatePlugin, VideoEventsPlugin, VideoCompletionHandler, VideoTranscriptFeedback
                     ].concat(autoAdvanceEnabled ? [VideoAutoAdvanceControl] : []),
                     bumperVideoModules = [VideoControl, VideoPlaySkipControl, VideoSkipControl,
-                        VideoVolumeControl, VideoCaption, VideoCommands, VideoSaveStatePlugin,
+                        VideoVolumeControl, VideoCaption, VideoCommands, VideoSaveStatePlugin, VideoTranscriptFeedback,
                         VideoEventsBumperPlugin, VideoCompletionHandler],
                     state = {
                         el: el,
diff --git a/xmodule/modulestore/store_utilities.py b/xmodule/modulestore/store_utilities.py
index ced5c9728ec0..e9710fbc92ce 100644
--- a/xmodule/modulestore/store_utilities.py
+++ b/xmodule/modulestore/store_utilities.py
@@ -17,11 +17,11 @@ def _prefix_only_url_replace_regex(pattern):
     Match urls in quotes pulling out the fields from pattern
     """
     return re.compile("""
-        (?x)                      # flags=re.VERBOSE
         (?P<quote>\\\\?['"])      # the opening quotes
         {}
         (?P=quote)                # the first matching closing quote
-        """.format(pattern))
+        """.format(pattern),
+        flags=re.VERBOSE)
 
 
 def rewrite_nonportable_content_links(source_course_id, dest_course_id, text):
diff --git a/xmodule/modulestore/tests/django_utils.py b/xmodule/modulestore/tests/django_utils.py
index fcc01763fdc7..952a88800f7c 100644
--- a/xmodule/modulestore/tests/django_utils.py
+++ b/xmodule/modulestore/tests/django_utils.py
@@ -369,7 +369,7 @@ class ModuleStoreTestUsersMixin():
     """
     A mixin to help manage test users.
     """
-    TEST_PASSWORD = 'test'
+    TEST_PASSWORD = 'Password1234'
 
     def create_user_for_course(self, course, user_type=CourseUserType.ENROLLED):
         """
diff --git a/xmodule/modulestore/tests/mongo_connection.py b/xmodule/modulestore/tests/mongo_connection.py
index 8da1fbd42387..a0ffe7e7c6f1 100644
--- a/xmodule/modulestore/tests/mongo_connection.py
+++ b/xmodule/modulestore/tests/mongo_connection.py
@@ -9,5 +9,4 @@
 import os
 
 MONGO_PORT_NUM = int(os.environ.get('EDXAPP_TEST_MONGO_PORT', '27017'))
-MONGO_HOST = os.environ.get('EDXAPP_TEST_MONGO_HOST',
-                            'edx.devstack.mongo' if 'BOK_CHOY_HOSTNAME' in os.environ else 'localhost')
+MONGO_HOST = os.environ.get('EDXAPP_TEST_MONGO_HOST', 'localhost')
diff --git a/xmodule/seq_block.py b/xmodule/seq_block.py
index 1faa48780864..2b9aed2dd732 100644
--- a/xmodule/seq_block.py
+++ b/xmodule/seq_block.py
@@ -832,10 +832,10 @@ def _capture_basic_metrics(self):
         """
         if not newrelic:
             return
-        newrelic.agent.add_custom_parameter('seq.block_id', str(self.location))
-        newrelic.agent.add_custom_parameter('seq.display_name', self.display_name or '')
-        newrelic.agent.add_custom_parameter('seq.position', self.position)
-        newrelic.agent.add_custom_parameter('seq.is_time_limited', self.is_time_limited)
+        newrelic.agent.add_custom_attribute('seq.block_id', str(self.location))
+        newrelic.agent.add_custom_attribute('seq.display_name', self.display_name or '')
+        newrelic.agent.add_custom_attribute('seq.position', self.position)
+        newrelic.agent.add_custom_attribute('seq.is_time_limited', self.is_time_limited)
 
     def _capture_full_seq_item_metrics(self, children):
         """
@@ -847,17 +847,17 @@ def _capture_full_seq_item_metrics(self, children):
             return
         # Basic count of the number of Units (a.k.a. VerticalBlocks) we have in
         # this learning sequence
-        newrelic.agent.add_custom_parameter('seq.num_units', len(children))
+        newrelic.agent.add_custom_attribute('seq.num_units', len(children))
 
         # Count of all modules (leaf nodes) in this sequence (e.g. videos,
         # problems, etc.) The units (verticals) themselves are not counted.
         all_item_keys = self._locations_in_subtree(self)
-        newrelic.agent.add_custom_parameter('seq.num_items', len(all_item_keys))
+        newrelic.agent.add_custom_attribute('seq.num_items', len(all_item_keys))
 
         # Count of all modules by block_type (e.g. "video": 2, "discussion": 4)
         block_counts = collections.Counter(usage_key.block_type for usage_key in all_item_keys)
         for block_type, count in block_counts.items():
-            newrelic.agent.add_custom_parameter(f'seq.block_counts.{block_type}', count)
+            newrelic.agent.add_custom_attribute(f'seq.block_counts.{block_type}', count)
 
     def _capture_current_unit_metrics(self, children):
         """
@@ -871,15 +871,15 @@ def _capture_current_unit_metrics(self, children):
         if 1 <= self.position <= len(children):
             # Basic info about the Unit...
             current = children[self.position - 1]
-            newrelic.agent.add_custom_parameter('seq.current.block_id', str(current.location))
-            newrelic.agent.add_custom_parameter('seq.current.display_name', current.display_name or '')
+            newrelic.agent.add_custom_attribute('seq.current.block_id', str(current.location))
+            newrelic.agent.add_custom_attribute('seq.current.display_name', current.display_name or '')
 
             # Examining all blocks inside the Unit (or split_test, conditional, etc.)
             child_locs = self._locations_in_subtree(current)
-            newrelic.agent.add_custom_parameter('seq.current.num_items', len(child_locs))
+            newrelic.agent.add_custom_attribute('seq.current.num_items', len(child_locs))
             curr_block_counts = collections.Counter(usage_key.block_type for usage_key in child_locs)
             for block_type, count in curr_block_counts.items():
-                newrelic.agent.add_custom_parameter(f'seq.current.block_counts.{block_type}', count)
+                newrelic.agent.add_custom_attribute(f'seq.current.block_counts.{block_type}', count)
 
     def _time_limited_student_view(self):
         """
diff --git a/xmodule/tests/test_capa_block.py b/xmodule/tests/test_capa_block.py
index b511fe403e43..ab94028fc955 100644
--- a/xmodule/tests/test_capa_block.py
+++ b/xmodule/tests/test_capa_block.py
@@ -29,6 +29,7 @@
 from xblock.scorable import Score
 
 import xmodule
+from openedx.core.djangolib.testing.utils import skip_unless_lms
 from xmodule.capa import responsetypes
 from xmodule.capa.correctmap import CorrectMap
 from xmodule.capa.responsetypes import LoncapaProblemError, ResponseError, StudentInputError
@@ -182,6 +183,7 @@ class CapaFactoryWithFiles(CapaFactory):
 
 
 @ddt.ddt
+@skip_unless_lms
 class ProblemBlockTest(unittest.TestCase):  # lint-amnesty, pylint: disable=missing-class-docstring
 
     def setUp(self):
@@ -2898,6 +2900,7 @@ def test_default(self):
         # ignore quotes
 
 
+@skip_unless_lms
 class ProblemCheckTrackingTest(unittest.TestCase):
     """
     Ensure correct tracking information is included in events emitted during problem checks.
diff --git a/xmodule/tests/test_library_tools.py b/xmodule/tests/test_library_tools.py
index 950307b6963d..e2daa723cc7b 100644
--- a/xmodule/tests/test_library_tools.py
+++ b/xmodule/tests/test_library_tools.py
@@ -1,9 +1,10 @@
 """
-Tests for library tools service.
+Tests for library tools service (only used by CMS)
 """
 from unittest.mock import patch
 
 from opaque_keys.edx.keys import UsageKey
+from openedx.core.djangolib.testing.utils import skip_unless_cms
 from openedx.core.djangoapps.content_libraries import api as library_api
 from openedx.core.djangoapps.content_libraries.tests.base import ContentLibrariesRestApiTest
 from openedx.core.djangoapps.xblock.api import load_block
@@ -13,6 +14,7 @@
 from xmodule.modulestore.tests.utils import MixedSplitTestCase
 
 
+@skip_unless_cms
 class LibraryToolsServiceTest(MixedSplitTestCase):
     """
     Tests for library service.
@@ -40,6 +42,7 @@ def test_list_available_libraries_fetch(self, mock_get_library_summaries):
         assert mock_get_library_summaries.called
 
 
+@skip_unless_cms
 class ContentLibraryToolsTest(MixedSplitTestCase, ContentLibrariesRestApiTest):
     """
     Tests for LibraryToolsService which interact with blockstore-based content libraries
@@ -63,16 +66,16 @@ def test_import_from_blockstore(self):
         course = CourseFactory.create(modulestore=self.store, user_id=self.user.id)
         CourseInstructorRole(course.id).add_users(self.user)
         # Add Source from library block to the course
-        sourced_block = self.make_block("library_sourced", course, user_id=self.user.id)
+        lc_block = self.make_block("library_content", course, user_id=self.user.id)
 
         # Import the unit block from the library to the course
-        self.tools.import_from_blockstore(sourced_block, [unit_block_id])
+        self.tools.import_from_blockstore(lc_block, [unit_block_id])
 
         # Verify imported block with its children
-        assert len(sourced_block.children) == 1
-        assert sourced_block.children[0].category == 'unit'
+        assert len(lc_block.children) == 1
+        assert lc_block.children[0].category == 'unit'
 
-        imported_unit_block = self.store.get_item(sourced_block.children[0])
+        imported_unit_block = self.store.get_item(lc_block.children[0])
         assert len(imported_unit_block.children) == 1
         assert imported_unit_block.children[0].category == 'html'
 
@@ -86,10 +89,10 @@ def test_import_from_blockstore(self):
 
         # Check that reimporting updates the target block
         self._set_library_block_olx(html_block_id, '<html><a href="/static/test.txt">Foo bar</a></html>')
-        self.tools.import_from_blockstore(sourced_block, [unit_block_id])
+        self.tools.import_from_blockstore(lc_block, [unit_block_id])
 
-        assert len(sourced_block.children) == 1
-        imported_unit_block = self.store.get_item(sourced_block.children[0])
+        assert len(lc_block.children) == 1
+        imported_unit_block = self.store.get_item(lc_block.children[0])
         assert len(imported_unit_block.children) == 1
         imported_html_block = self.store.get_item(imported_unit_block.children[0])
         assert 'Hello world' not in imported_html_block.data
diff --git a/xmodule/tests/test_mongo_utils.py b/xmodule/tests/test_mongo_utils.py
index 94182b24a725..cfa08ba15708 100644
--- a/xmodule/tests/test_mongo_utils.py
+++ b/xmodule/tests/test_mongo_utils.py
@@ -3,7 +3,6 @@
 """
 
 
-import os
 from unittest import TestCase
 from uuid import uuid4
 
@@ -29,7 +28,7 @@ def test_connect_to_mongo_read_preference(self, enum_name, mongos_name, expected
         """
         Test that read_preference parameter gets converted to a valid pymongo read preference.
         """
-        host = 'edx.devstack.mongo' if 'BOK_CHOY_HOSTNAME' in os.environ else 'localhost'
+        host = 'localhost'
         db = 'test_read_preference_%s' % uuid4().hex
         # Support for read_preference given in constant name form (ie. PRIMARY, SECONDARY_PREFERRED)
         connection = connect_to_mongodb(db, host, read_preference=enum_name)
diff --git a/xmodule/tests/test_video.py b/xmodule/tests/test_video.py
index 7daa6bdfe097..e5180843d7c6 100644
--- a/xmodule/tests/test_video.py
+++ b/xmodule/tests/test_video.py
@@ -15,7 +15,6 @@
 
 import datetime
 import json
-import os
 import shutil
 import unittest
 from tempfile import mkdtemp
@@ -937,7 +936,7 @@ def test_student_view_data_with_hls_flag(self, mock_get_video_info, mock_get_vid
 @patch.object(settings, 'CONTENTSTORE', create=True, new={
     'ENGINE': 'xmodule.contentstore.mongo.MongoContentStore',
     'DOC_STORE_CONFIG': {
-        'host': 'edx.devstack.mongo' if 'BOK_CHOY_HOSTNAME' in os.environ else 'localhost',
+        'host': 'localhost',
         'db': 'test_xcontent_%s' % uuid4().hex,
     },
     # allow for additional options that can be keyed on a name, e.g. 'trashcan'
diff --git a/xmodule/video_block/video_block.py b/xmodule/video_block/video_block.py
index fdc9a0270b06..e28b47f56fc6 100644
--- a/xmodule/video_block/video_block.py
+++ b/xmodule/video_block/video_block.py
@@ -30,9 +30,9 @@
 from xblock.fields import ScopeIds
 from xblock.runtime import KvsFieldData
 
-from common.djangoapps.xblock_django.constants import ATTR_KEY_REQUEST_COUNTRY_CODE
+from common.djangoapps.xblock_django.constants import ATTR_KEY_REQUEST_COUNTRY_CODE, ATTR_KEY_USER_ID
 from openedx.core.djangoapps.video_config.models import HLSPlaybackEnabledFlag, CourseYoutubeBlockedFlag
-from openedx.core.djangoapps.video_config.toggles import PUBLIC_VIDEO_SHARE
+from openedx.core.djangoapps.video_config.toggles import PUBLIC_VIDEO_SHARE, TRANSCRIPT_FEEDBACK
 from openedx.core.djangoapps.video_pipeline.config.waffle import DEPRECATE_YOUTUBE
 from openedx.core.lib.cache_utils import request_cached
 from openedx.core.lib.courses import get_course_by_id
@@ -448,6 +448,7 @@ def get_html(self, view=STUDENT_VIEW, context=None):  # lint-amnesty, pylint: di
             'transcriptAvailableTranslationsUrl': self.runtime.handler_url(
                 self, 'transcript', 'available_translations'
             ).rstrip('/?'),
+            'aiTranslationsUrl': settings.AI_TRANSLATIONS_API_URL,
             'transcriptLanguage': transcript_language,
             'transcriptLanguages': sorted_languages,
             'transcriptTranslationUrl': self.runtime.handler_url(
@@ -479,6 +480,8 @@ def get_html(self, view=STUDENT_VIEW, context=None):  # lint-amnesty, pylint: di
             'id': self.location.html_id(),
             'block_id': str(self.location),
             'course_id': str(self.location.course_key),
+            'video_id': str(self.edx_video_id),
+            'user_id': self.get_user_id(),
             'is_embed': is_embed,
             'license': getattr(self, "license", None),
             'metadata': json.dumps(OrderedDict(metadata)),
@@ -486,6 +489,7 @@ def get_html(self, view=STUDENT_VIEW, context=None):  # lint-amnesty, pylint: di
             'track': track_url,
             'transcript_download_format': transcript_download_format,
             'transcript_download_formats_list': self.fields['transcript_download_format'].values,  # lint-amnesty, pylint: disable=unsubscriptable-object
+            'transcript_feedback_enabled': self.is_transcript_feedback_enabled(),
         }
         if self.is_public_sharing_enabled():
             public_video_url = self.get_public_video_url()
@@ -541,6 +545,21 @@ def is_public_sharing_enabled(self):
         else:
             return self.public_access
 
+    def is_transcript_feedback_enabled(self):
+        """
+        Is transcript feedback enabled for this video?
+        """
+        try:
+            # Video transcript feedback must be enabled in order to show the widget
+            feature_enabled = TRANSCRIPT_FEEDBACK.is_enabled(self.location.course_key)
+        except Exception as err:  # pylint: disable=broad-except
+            log.exception(f"Error retrieving course for course ID: {self.location.course_key}")
+            return False
+        return feature_enabled
+
+    def get_user_id(self):
+        return self.runtime.service(self, 'user').get_current_user().opt_attrs.get(ATTR_KEY_USER_ID)
+
     def get_public_video_url(self):
         """
         Returns the public video url